X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..e2ca829e7dc84e32a0949cbd852adf9b59cacd0b:/include/wx/motif/frame.h

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index f0493408da..7a63af17e4 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -42,45 +42,32 @@ public:
         const wxString& name = wxFrameNameStr);
     
     virtual ~wxFrame();
-    
+
     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();
 #endif // wxUSE_STATUSBAR
     
     // 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 = wxNO_BORDER|wxTB_HORIZONTAL,
+                                     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,28 +83,33 @@ 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,
@@ -126,8 +118,16 @@ protected:
     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)
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif