wxControl and wxChoice derive from the base classes under wxGTK too now

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 9f079fd1386e9c470deb247e6e1d55b7158155ea..aded67d34f85bf74e7239b622d4fedfd4004a485 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -363,7 +363,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,

-               T("recreating status bar in wxFrame") );
+               wxT("recreating status bar in wxFrame") );

 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);
 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);


@@ -378,14 +378,14 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set text for") );
+  wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );

 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {
 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set widths for") );
+  wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );

 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();


@@ -429,7 +429,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
         return;
     }
 
         return;
     }
 

-    wxCHECK_RET( !menu_bar->GetFrame(), T("this menubar is already attached") );
+    wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );

 
     if (m_frameMenuBar)
         delete m_frameMenuBar;
 
     if (m_frameMenuBar)
         delete m_frameMenuBar;


@@ -705,9 +705,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-void wxFrame::ScreenToClient(int *x, int *y) const
+void wxFrame::DoScreenToClient(int *x, int *y) const

 {
 {

-    wxWindow::ScreenToClient(x, y);
+    wxWindow::DoScreenToClient(x, y);

 
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear
 
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear


@@ -717,7 +717,7 @@ void wxFrame::ScreenToClient(int *x, int *y) const
     *y -= pt.y;
 }
 
     *y -= pt.y;
 }
 

-void wxFrame::ClientToScreen(int *x, int *y) const
+void wxFrame::DoClientToScreen(int *x, int *y) const

 {
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear
 {
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear


@@ -726,14 +726,14 @@ void wxFrame::ClientToScreen(int *x, int *y) const
     *x += pt1.x;
     *y += pt1.y;
 
     *x += pt1.x;
     *y += pt1.y;
 

-    wxWindow::ClientToScreen(x, y);
+    wxWindow::DoClientToScreen(x, y);

 }
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
 }
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

-                 T("recreating toolbar in wxFrame") );
+                 wxT("recreating toolbar in wxFrame") );

 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)