Added helper functions for string -> XmString conversion.

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index dfd1df99d69f30c7ad3127c1d5ed9a8642debd42..024c6f9bd235093743fe98ac752107a5447c9d71 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
 


@@ -44,12 +44,7 @@ class WXDLLEXPORT wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 

-// FIXME - temporary hack in absence of wxTLW !!
-#ifndef wxTopLevelWindowNative
-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase
-#else

 class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow

-#endif

 {
 public:
     // construction
 {
 public:
     // construction


@@ -71,6 +66,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
     // ------------------
 


@@ -79,8 +81,10 @@ public:
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 

+#ifdef WXWIN_COMPATIBILITY_2_2

     // call this to simulate a menu command
     bool Command(int id) { return ProcessCommand(id); }
     // call this to simulate a menu command
     bool Command(int id) { return ProcessCommand(id); }

+#endif // WXWIN_COMPATIBILITY_2_2

 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);


@@ -110,6 +114,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 +203,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;
 


@@ -210,6 +215,7 @@ protected:
 #endif // wxUSE_TOOLBAR
 
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_TOOLBAR
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxFrameBase)

 };
 
 // include the real class declaration
 };
 
 // include the real class declaration