don't give empty message box if Parse(FALSE) was called and there was --help on the...

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 544189a24c7a68c61921e1b789029df3ab0e33c3..8ab73139d86d4f4a59444f19f49378c18d18cfa2 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -76,6 +76,8 @@ wxFrameBase::wxFrameBase()
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif // wxUSE_STATUSBAR

+
+    m_statusBarPane = 0;

 }
 
 wxFrameBase::~wxFrameBase()
 }
 
 wxFrameBase::~wxFrameBase()


@@ -152,7 +154,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 

-#if wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)

     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {


@@ -196,6 +198,7 @@ bool wxFrameBase::ProcessCommand(int id)
         if (item->IsCheckable())
         {
             item->Toggle();
         if (item->IsCheckable())
         {
             item->Toggle();

+

             // use the new value
             commandEvent.SetInt(item->IsChecked());
         }
             // use the new value
             commandEvent.SetInt(item->IsChecked());
         }


@@ -276,16 +279,40 @@ void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
     PositionStatusBar();
 }
 
     PositionStatusBar();
 }
 

-bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
+void wxFrameBase::PushStatusText(const wxString& text, int number)

 {
 {

-#if wxUSE_MENUS
-    if ( !statbar )
-        return FALSE;
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );

 
 

+    m_frameStatusBar->PushStatusText(text, number);
+}
+
+void wxFrameBase::PopStatusText(int number)
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+    m_frameStatusBar->PopStatusText(number);
+}
+
+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+    if ( m_statusBarPane < 0 ) return;
+    wxStatusBar* statbar = GetStatusBar();
+    if ( !statbar ) return;
+
+    wxString help = show ? text : wxString();
+    statbar->SetStatusText( help, m_statusBarPane );
+#endif // wxUSE_STATUSBAR
+}
+
+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 no help string found, we will clear the status bar text
     wxString helpString;

+    bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;

 
 

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

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


@@ -298,9 +325,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
         }
     }
 
         }
     }
 

-    // set status text even if the string is empty - this will at least
-    // remove the string from the item which was previously selected
-    statbar->SetStatusText(helpString);
+    DoGiveHelp(helpString, show);

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


@@ -409,8 +434,8 @@ void wxFrameBase::AttachMenuBar(wxMenuBar *menubar)
 {
     if ( menubar )
     {
 {
     if ( menubar )
     {

-        m_frameMenuBar = menubar;

         menubar->Attach((wxFrame *)this);
         menubar->Attach((wxFrame *)this);

+        m_frameMenuBar = menubar;

     }
 }
 
     }
 }