Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom

[wxWidgets.git] / demos / dbbrowse / tabpgwin.cpp

diff --git a/demos/dbbrowse/tabpgwin.cpp b/demos/dbbrowse/tabpgwin.cpp
index f0c4ac9970e2fbef74fc4354dc33240e26c897d4..d11286c20cdf4a36643fdc338d9dbeb741edd32a 100644 (file)
--- a/demos/dbbrowse/tabpgwin.cpp
+++ b/demos/dbbrowse/tabpgwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
+// Name:        tabpgwin.cpp
 // Purpose:     Contrib. demo
 // Author:      Aleksandras Gluchovas
 // Modified by: 19990908 : mj
@@ -18,7 +18,7 @@
 
 #ifdef __GNUG__
 #pragma implementation
-// #pragma interface
+//#pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -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();
     
@@ -506,7 +506,7 @@ wxFont wxTabbedWindow::GetLabelingFont()
 {
     wxFont font;
 #ifdef __WINDOWS__
-    font.SetFaceName("MS Sans Serif");
+    font.SetFaceName(_T("MS Sans Serif"));
 #else
     font.SetFamily( wxSWISS );
 #endif
@@ -736,7 +736,7 @@ wxFont wxPagedWindow::GetLabelingFont()
     wxFont font;
     
 #ifdef __WINDOWS__
-    font.SetFaceName("Comic Sans MS");
+    font.SetFaceName(_T("Comic Sans MS"));
 #else
     font.SetFamily( wxSWISS );
 #endif