[Hugin-cvs] SF.net SVN: hugin: [3090] hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp

[<da...@us...>]

Revision: 3090
          http://hugin.svn.sourceforge.net/hugin/?rev=3090&view=rev
Author:   dangelo
Date:     2008-05-27 08:43:09 -0700 (Tue, 27 May 2008)

Log Message:
-----------
do not require wxWidgets 2.8

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp

Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp	2008-05-27 13:42:57 UTC (rev 3089)
+++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp	2008-05-27 15:43:09 UTC (rev 3090)
@@ -136,13 +136,19 @@
                 if (dlg == 0) {
                     return FALSE;
                 }
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8
                 dlg->Pulse(wxString(argument, wxConvLocal));
+#elsif wxMAJOR_VERSION == 2
+                dlg->Update(0, wxString(argument, wxConvLocal));
+#endif
             }
             return TRUE;
         case _setProgress:
             if (dlg) {
                 if( *argument != 0 )
                 {
+                    bool cont;
+
                     if( *argument != '+' )
                     {
                         strcpy( mainMessage, argument );
@@ -152,7 +158,12 @@
                     {
                         sprintf( text,"%s%s", mainMessage, &(argument[1]) );
                     }
-                    if (! dlg->Pulse(wxString(text, wxConvLocal))) {
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8
+                    cont = dlg->Pulse(wxString(argument, wxConvLocal));
+#elsif wxMAJOR_VERSION == 2
+                    cont = dlg->Update(1, wxString(argument, wxConvLocal));
+#endif
+                    if (! cont) {
                         return FALSE;
                     }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.