From 3851e4791876cf3ccfb52101923e901f7c97c200 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 18 Apr 2004 10:27:11 +0000 Subject: [PATCH] Applied patch for hiding statusbar. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/frame.h | 2 ++ include/wx/gtk1/frame.h | 2 ++ src/gtk/frame.cpp | 10 ++++++++++ src/gtk1/frame.cpp | 10 ++++++++++ 4 files changed, 24 insertions(+) diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index ecb5d0d02a..3befcf231f 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -65,6 +65,8 @@ public: long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); + + void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index ecb5d0d02a..3befcf231f 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -65,6 +65,8 @@ public: long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); + + void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index a53ad607c0..45d8071cdc 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -675,6 +675,16 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, return wxFrameBase::CreateStatusBar( number, style, id, name ); } +void wxFrame::SetStatusBar(wxStatusBar *statbar) +{ + bool hadStatBar = m_frameStatusBar != NULL; + + wxFrameBase::SetStatusBar(statbar); + + if (hadStatBar && !m_frameToolBar) + GtkUpdateSize(); +} + void wxFrame::PositionStatusBar() { if ( !m_frameStatusBar ) diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index a53ad607c0..45d8071cdc 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -675,6 +675,16 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, return wxFrameBase::CreateStatusBar( number, style, id, name ); } +void wxFrame::SetStatusBar(wxStatusBar *statbar) +{ + bool hadStatBar = m_frameStatusBar != NULL; + + wxFrameBase::SetStatusBar(statbar); + + if (hadStatBar && !m_frameToolBar) + GtkUpdateSize(); +} + void wxFrame::PositionStatusBar() { if ( !m_frameStatusBar ) -- 2.47.2