fixed wxBitmap<->wxImage conversion to not exchange red and blue components

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 6581648df7b70a960dc70a6920f4bdf4e4f48382..218239b815e9b54157100e8d99f8cc20de535a02 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -365,9 +365,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
 #if wxUSE_MENUS
     // if no help string found, we will clear the status bar text
     wxString helpString;
 #if wxUSE_MENUS
     // if no help string found, we will clear the status bar text
     wxString helpString;

-    bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;
-
-    if ( show )
+    if ( menuId != wxID_SEPARATOR && menuId != -3 /* wxID_TITLE */ )

     {
         wxMenuBar *menuBar = GetMenuBar();
         if ( menuBar )
     {
         wxMenuBar *menuBar = GetMenuBar();
         if ( menuBar )


@@ -380,7 +378,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
         }
     }
 
         }
     }
 

-    DoGiveHelp(helpString, show);
+    DoGiveHelp(helpString);

 
     return !helpString.empty();
 #else // !wxUSE_MENUS
 
     return !helpString.empty();
 #else // !wxUSE_MENUS


@@ -403,7 +401,8 @@ void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
 
 #endif // wxUSE_STATUSBAR
 
 
 #endif // wxUSE_STATUSBAR
 

-void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+#if wxUSE_MENUS || wxUSE_TOOLBAR
+void wxFrameBase::DoGiveHelp(const wxString& help)

 {
 #if wxUSE_STATUSBAR
     if ( m_statusBarPane < 0 )
 {
 #if wxUSE_STATUSBAR
     if ( m_statusBarPane < 0 )


@@ -416,20 +415,17 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
     if ( !statbar )
         return;
 
     if ( !statbar )
         return;
 

-    wxString help;
-    if ( show )
-        help = text;
-
-    // remember the old status bar text if this is the first time we're called
-    // since the menu has been opened as we're going to overwrite it in our
-    // DoGiveHelp() and we want to restore it when the menu is closed
+    // remember the old status bar text if this is the first time we're
+    // called since the menu has been opened as we're going to overwrite it
+    // in our DoGiveHelp() and we want to restore it when the menu is
+    // closed

     //
     //

-    // note that it would be logical to do this in OnMenuOpen() but under MSW
-    // we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely enough, and
-    // so this doesn't work and instead we use the ugly trick with using
-    // special m_oldStatusText value as "menu opened" (but it is arguably
-    // better than adding yet another member variable to wxFrame on all
-    // platforms)
+    // note that it would be logical to do this in OnMenuOpen() but under
+    // MSW we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely
+    // enough, and so this doesn't work and instead we use the ugly trick
+    // with using special m_oldStatusText value as "menu opened" (but it is
+    // arguably better than adding yet another member variable to wxFrame
+    // on all platforms)

     if ( m_oldStatusText.empty() )
     {
         m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
     if ( m_oldStatusText.empty() )
     {
         m_oldStatusText = statbar->GetStatusText(m_statusBarPane);


@@ -446,6 +442,7 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
     wxUnusedVar(show);
 #endif // wxUSE_STATUSBAR
 }
     wxUnusedVar(show);
 #endif // wxUSE_STATUSBAR
 }

+#endif // wxUSE_MENUS || wxUSE_TOOLBAR

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------