Committing in .

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 9e41888e34877848fc9408e2d525f9a0cfd0d50f..b6d4bd5ccc053b3fa5f4160f48fca9e165b52504 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -38,7 +38,7 @@
 #include "wx/log.h"
 
 #if wxUSE_NATIVE_STATUSBAR
-    #include <wx/msw/statbr95.h>
+    #include "wx/msw/statbr95.h"
 #endif
 
 extern wxWindowList wxModelessWindows;
@@ -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,
-               T("recreating status bar in wxFrame") );
+               wxT("recreating status bar in wxFrame") );
 
   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)
 {
-  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[])
 {
-  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();
@@ -429,7 +429,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
         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;
@@ -670,11 +670,10 @@ bool wxFrame::ProcessCommand(int id)
     if ( !bar )
         return FALSE;
 
-    wxMenuItem *item = bar->FindItemForId(id);
-
-    if ( item &&  item->IsCheckable() )
+    wxMenuItem *item = bar->FindItem(id);
+    if ( item && item->IsCheckable() )
     {
-        bar->Check(id, !bar->IsChecked(id)) ;
+        item->Toggle();
     }
 
     wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
@@ -705,9 +704,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     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
@@ -717,7 +716,7 @@ void wxFrame::ScreenToClient(int *x, int *y) const
     *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
@@ -726,14 +725,14 @@ void wxFrame::ClientToScreen(int *x, int *y) const
     *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,
-                 T("recreating toolbar in wxFrame") );
+                 wxT("recreating toolbar in wxFrame") );
 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
@@ -1061,3 +1060,4 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
     return rc;
 }
+