Patch 559673 and 561053

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index dfd1df99d69f30c7ad3127c1d5ed9a8642debd42..0735c82f8ab5e3bcd42c5d933c542e922e43642d 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -110,6 +110,10 @@ public:
     virtual void SetStatusWidths(int n, const int widths_field[]);
     void PushStatusText(const wxString &text, int number = 0);
     void PopStatusText(int number = 0);
     virtual void SetStatusWidths(int n, const int widths_field[]);
     void PushStatusText(const wxString &text, int number = 0);
     void PopStatusText(int number = 0);

+
+    // set the status bar pane the help will be shown in
+    void SetStatusBarPane(int n) { m_statusBarPane = n; }
+    int GetStatusBarPane() const { return m_statusBarPane; }

 #endif // wxUSE_STATUSBAR
 
     // toolbar functions
 #endif // wxUSE_STATUSBAR
 
     // toolbar functions


@@ -195,9 +199,6 @@ protected:
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 

-    // set the status bar pane the help will be shown in
-    void SetStatusBarPane(int n) { m_statusBarPane = n; }
-    int GetStatusBarPane() const { return m_statusBarPane; }

 
     int m_statusBarPane;
 
 
     int m_statusBarPane;