[Hugin-cvs] hugin/src/include/hugin CPEditorPanel.h,1.39,1.40 ImagesPanel.h,1.30,1.31 LensPanel.h,1.30,1.31 OptimizePanel.h,1.8,1.9 PanoPanel.h,1.34,1.35 wxPanoCommand.h,1.19,1.20

[Douglas W. <dwi...@us...>]

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11980/src/include/hugin

Modified Files:
	CPEditorPanel.h ImagesPanel.h LensPanel.h OptimizePanel.h 
	PanoPanel.h wxPanoCommand.h 
Log Message:
wxSplitterWindows have problems on wxMSW. Disable until I can find a solution :-(

Index: CPEditorPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/CPEditorPanel.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- CPEditorPanel.h	12 Feb 2005 07:24:24 -0000	1.39
+++ CPEditorPanel.h	22 Feb 2005 10:09:10 -0000	1.40
@@ -237,7 +237,7 @@
     wxCheckBox *m_autoAddCB;
     wxCheckBox *m_fineTuneCB;
     wxCheckBox *m_estimateCB;
-#if wxCHECK_VERSION(2,5,3)
+#ifdef USE_WX25x
 	wxScrolledWindow *m_cp_ctrls;
     wxSplitterWindow *m_cp_splitter;
 #endif

Index: wxPanoCommand.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/wxPanoCommand.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- wxPanoCommand.h	6 Feb 2005 14:26:13 -0000	1.19
+++ wxPanoCommand.h	22 Feb 2005 10:09:17 -0000	1.20
@@ -174,6 +174,7 @@
                             pano.setImageFilename(i, (const char *)dlg.GetPath().mb_str());
                             // save used path
                             basedir = dlg.GetDirectory();
+							DEBUG_INFO("basedir is: " << basedir.mb_str());
                         } else {
                             PanoramaMemento emptyPano;
                             pano.setMemento(emptyPano);

Index: ImagesPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/ImagesPanel.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ImagesPanel.h	10 Feb 2005 16:15:00 -0000	1.30
+++ ImagesPanel.h	22 Feb 2005 10:09:12 -0000	1.31
@@ -74,6 +74,10 @@
     // event handlers
     void OnAddImages(wxCommandEvent & e);
     void OnRemoveImages(wxCommandEvent & e);
+#ifdef USE_WX25x
+	void OnPositionChanged(wxSplitterEvent& event);
+#endif
+
     // Here we select the preview image
 
     /**  gui -> pano */
@@ -130,7 +134,7 @@
     wxButton * m_matchingButton;
     wxButton * m_removeCPButton;
 	
-#if wxCHECK_VERSION(2,5,3)
+#ifdef USE_WX25x
 	wxScrolledWindow *m_img_ctrls;
 	wxSplitterWindow *m_img_splitter;
 #endif

Index: PanoPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PanoPanel.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- PanoPanel.h	10 Feb 2005 16:15:00 -0000	1.34
+++ PanoPanel.h	22 Feb 2005 10:09:17 -0000	1.35
@@ -140,7 +140,7 @@
     wxButton    * m_CalcHFOVButton;
     wxButton    * m_CalcOptWidthButton;
 
-#if wxCHECK_VERSION(2,5,3)
+#ifdef USE_WX25x
 	wxScrolledWindow *m_pano_ctrls;
 #endif
 

Index: OptimizePanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/OptimizePanel.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- OptimizePanel.h	10 Feb 2005 16:15:00 -0000	1.8
+++ OptimizePanel.h	22 Feb 2005 10:09:14 -0000	1.9
@@ -100,7 +100,7 @@
     wxCheckBox * m_edit_cb;
     wxChoice * m_mode_cb;
 	
-#if wxCHECK_VERSION(2,5,3)
+#ifdef USE_WX25x
 	wxScrolledWindow *m_opt_ctrls;
 #endif
 	

Index: LensPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/LensPanel.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- LensPanel.h	10 Feb 2005 16:15:00 -0000	1.30
+++ LensPanel.h	22 Feb 2005 10:09:12 -0000	1.31
@@ -124,7 +124,7 @@
     int m_distDigitsEdit;
     int m_pixelDigits;
 
-#if wxCHECK_VERSION(2,5,3)
+#ifdef USE_WX25x
     wxScrolledWindow *m_lens_ctrls;
 	wxSplitterWindow *m_lens_splitter;
 #endif