post wxUniv merge fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:09:23 +00:00
parent 685aded8fd
commit 0147a7c140
2 changed files with 8 additions and 8 deletions
--- 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();