post wxUniv merge fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/tabpgwin.cpp b/demos/dbbrowse/tabpgwin.cpp
index 6f3b70bbee5de43c87cff8168aaf73aff40389a3..a6e102fc70ae6f4bd0b128b1f8a0e9d42ddc2b92 100644 (file)
--- a/demos/dbbrowse/tabpgwin.cpp
+++ b/demos/dbbrowse/tabpgwin.cpp
@@ -197,10 +197,10 @@ void wxTabbedWindow::SizeTabs(int x,int y, int width, int height, bool repant)
 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------

-void wxTabbedWindow::AddTab( wxWindow* pContent,
-                            wxString  tabText,
-                            wxString  imageFileName,
-                            long      imageType )
+void wxTabbedWindow::AddTab( wxWindow*   pContent,
+                            wxString     tabText,
+                            wxString     imageFileName,
+                            wxBitmapType imageType )

 {
     twTabInfo* pTab = new twTabInfo();
     
 {
     twTabInfo* pTab = new twTabInfo();
     

diff --git a/demos/dbbrowse/tabpgwin.h b/demos/dbbrowse/tabpgwin.h
index 20d6163fc2fecb0d600c3e6706e7ebcd4f1ff22c..c9928ebf85565d3c6af27778b120b722ac56ca2e 100644 (file)
--- a/demos/dbbrowse/tabpgwin.h
+++ b/demos/dbbrowse/tabpgwin.h
@@ -100,10 +100,10 @@ public:
  // tabs can be also added when the window is
  // already displayed - "on the fly"
 
  // tabs can be also added when the window is
  // already displayed - "on the fly"
 

- virtual void AddTab( wxWindow* pContent,           // contained window
-                      wxString  tabText,            // tab label
-                      wxString  imageFileName = "", // if "", only text label is displayed
-                      long      imageType     = wxBITMAP_TYPE_BMP );
+ virtual void AddTab( wxWindow*    pContent,           // contained window
+                      wxString     tabText,            // tab label
+                      wxString     imageFileName = "", // if "", only text label is displayed
+                      wxBitmapType imageType     = wxBITMAP_TYPE_BMP );

 
  // NOTE:: if this AddTab(..) overload is called, the
  //        image bitmap will not be serialized (if performed),
 
  // NOTE:: if this AddTab(..) overload is called, the
  //        image bitmap will not be serialized (if performed),