Notebook, Listbox, and Checklst updates

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index ac7e48f61c5036e0cadbd20df82c25fb197dfa87..2af6cd1d8dde76a80adf04e22d4c3dd7f0368a82 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "framebase.h"
 #endif
 
     #pragma interface "framebase.h"
 #endif
 


@@ -71,6 +71,13 @@ public:
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 

+    // sends a size event to the window using its current size -- this has an
+    // effect of refreshing the window layout
+    //
+    // currently it is only implemented under MSW but is declared here to make
+    // it possible to call it in portable code without using #ifdef's
+    virtual void SendSizeEvent() { }
+

     // menu bar functions
     // ------------------
 
     // menu bar functions
     // ------------------
 


@@ -108,6 +115,12 @@ public:
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, int number = 0);
     virtual void SetStatusWidths(int n, const int widths_field[]);
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, 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


@@ -151,6 +164,10 @@ public:
         { return FALSE; }
 #endif // no wxTopLevelWindowNative
 
         { return FALSE; }
 #endif // no wxTopLevelWindowNative
 

+    // show help text (typically in the statusbar); show is FALSE
+    // if you are hiding the help, TRUE otherwise
+    virtual void DoGiveHelp(const wxString& text, bool show);
+

 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------
 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------


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

+
+    int m_statusBarPane;
+

 #if wxUSE_TOOLBAR
     // override to update status bar position (or anything else) when
     // something changes
 #if wxUSE_TOOLBAR
     // override to update status bar position (or anything else) when
     // something changes