Initial/Best size fixes for wxRadioBox, wxSlider and wxStaticText on wxMSW

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 7eef0ba08b450e4610a75f986c64e6e176e9dac1..4cb7f953c86a8a48536b6546ddddf009e6d26b07 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -12,8 +12,8 @@
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
-#ifdef __GNUG__
-    #pragma interface "frame.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "frame.h"
 #endif
 
 class WXDLLEXPORT wxFrame : public wxFrameBase
@@ -21,12 +21,12 @@ class WXDLLEXPORT wxFrame : public wxFrameBase
 public:
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+        wxWindowID id,
+        const wxString& title,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_FRAME_STYLE,
+        const wxString& name = wxFrameNameStr)
     {
         Init();
 
@@ -34,26 +34,26 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+        wxWindowID id,
+        const wxString& title,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_FRAME_STYLE,
+        const wxString& name = wxFrameNameStr);
 
     virtual ~wxFrame();
 
-    bool Show(bool show);
+    virtual bool Show(bool show = TRUE);
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
 
     // Set title
     void SetTitle(const wxString& title);
-    wxString GetTitle() const { return m_title; }
 
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcons(const wxIconBundle& icons);
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
@@ -61,26 +61,13 @@ public:
 
     // Create toolbar
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void SetToolBar(wxToolBar *toolbar);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
-    // Iconize
-    virtual void Iconize(bool iconize);
-
-    virtual bool IsIconized() const;
-
-    // Is the frame maximized? Returns FALSE under Motif (but TRUE for
-    // wxMDIChildFrame due to the tabbed implementation).
-    virtual bool IsMaximized() const;
-
-    virtual void Maximize(bool maximize);
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual void Restore();
-
     // Implementation only from now on
     // -------------------------------
 
@@ -96,39 +83,51 @@ public:
     WXWidget GetClientAreaWidget() const { return m_clientArea; }
     WXWidget GetTopWidget() const { return m_frameShell; }
 
-    virtual WXWidget GetMainWidget() const { return m_frameWidget; }
+    virtual WXWidget GetMainWidget() const { return m_mainWidget; }
 
     // The widget that can have children on it
     WXWidget GetClientWidget() const;
     bool GetVisibleStatus() const { return m_visibleStatus; }
+    void SetVisibleStatus( bool status ) { m_visibleStatus = status; }
 
     bool PreResize();
 
-protected:
+    void SendSizeEvent();
+
+    // for generic/mdig.h
+    virtual void DoGetClientSize(int *width, int *height) const;
+private:
     // common part of all ctors
     void Init();
 
+    // set a single icon for the frame
+    void DoSetIcon( const wxIcon& icon );
+
     //// Motif-specific
     WXWidget              m_frameShell;
-    WXWidget              m_frameWidget;
     WXWidget              m_workArea;
     WXWidget              m_clientArea;
-    wxString              m_title;
     bool                  m_visibleStatus;
     bool                  m_iconized;
 
-    virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
 private:
+    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
+                           const wxString& title,
+                           const wxPoint& pos,
+                           const wxSize& size,
+                           long style,
+                           const wxString& name );
+    virtual void DoDestroy();
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif
-    // _WX_MOTIF_FRAME_H_
+// _WX_MOTIF_FRAME_H_