::Initialize() methods added to the helper classes

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 5feb46e42f2c4cd9e9721d8064a48c8b7f655ba8..331568d974e3f9a9e3b2f0ce12ceeabfc7ffd01c 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -28,113 +28,84 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxMacToolTip ;
 

-class WXDLLEXPORT wxFrame: public wxWindow {
+class WXDLLEXPORT wxFrame: public wxFrameBase {

 
   DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:
 
   DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:

-  wxFrame();
-  inline 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)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  ~wxFrame();
-
-  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);
-
-  virtual bool Destroy();
-
-  void OnSize(wxSizeEvent& event);
-  void OnMenuHighlight(wxMenuEvent& event);
-  void OnActivate(wxActivateEvent& event);
-  void OnIdle(wxIdleEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
-
-  // Set menu bar
-  void SetMenuBar(wxMenuBar *menu_bar);
-  virtual wxMenuBar *GetMenuBar() const ;
-
-  // Call this to simulate a menu command
-  virtual void Command(int id);
-  virtual void ProcessCommand(int id);
-
-  // Set icon
-  virtual void SetIcon(const wxIcon& icon);
-
-  // Create status line
-  virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-    const wxString& name = "statusBar");
-  inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
-  virtual void PositionStatusBar();
-  virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name);
-
+    // construction
+    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)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    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);
+
+    virtual ~wxFrame();
+
+    // implement base class pure virtuals
+    virtual void Maximize(bool maximize = TRUE);
+    virtual bool IsMaximized() const;
+    virtual void Iconize(bool iconize = TRUE);
+    virtual bool IsIconized() const;
+    virtual void Restore();
+    virtual void SetMenuBar(wxMenuBar *menubar);
+    virtual void SetIcon(const wxIcon& icon);
+
+    // implementation only from now on
+    // -------------------------------
+
+    // override some more virtuals
+       virtual bool Enable(bool enable) ;
+
+    // get the origin of the client area (which may be different from (0, 0)
+    // if the frame has a toolbar) in client coordinates
+    virtual wxPoint GetClientAreaOrigin() const;
+
+    // event handlers
+    void OnActivate(wxActivateEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+    // Toolbar

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

+    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);

 
 

-  // Create toolbar
-  virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
-  virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
-  // If made known to the frame, the frame will manage it automatically.
-  virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
-  virtual inline wxToolBar *GetToolBar() const { return m_frameToolBar; }
-  virtual void PositionToolBar();
-
-#endif
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR

 
 

-  // Set status line text
-  virtual void SetStatusText(const wxString& text, int number = 0);
+    // Status bar
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
+                                           long style = wxST_SIZEGRIP,
+                                           wxWindowID id = 0,
+                                           const wxString& name = wxStatusLineNameStr);

 
 

-  // Set status line widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
+    virtual void PositionStatusBar();

 
   // Hint to tell framework which status bar to use
   // TODO: should this go into a wxFrameworkSettings class perhaps?
   static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
   static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
 
   // Hint to tell framework which status bar to use
   // TODO: should this go into a wxFrameworkSettings class perhaps?
   static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
   static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };

+#endif // wxUSE_STATUSBAR

 
 

-  // Fit frame around subwindows
-  virtual void Fit();
-
-  // Iconize
-  virtual void Iconize(bool iconize);
-
-  virtual bool IsIconized() const ;
-
-  // Compatibility
-  inline bool Iconized() const { return IsIconized(); }
-
-  // Is the frame maximized?
-  virtual bool IsMaximized(void) const ;
-
-  virtual void Maximize(bool maximize);
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-  // Query app for menu item updates (called from OnIdle)
-    // Query app for menu item updates (called from OnIdle)
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
-
-  // Checks if there is a toolbar, and returns the first free client position
-  virtual wxPoint GetClientAreaOrigin() const;
-       virtual void GetClientSize(int *x, int *y) const ;
-       virtual void DoSetClientSize(int clientwidth, int clientheight) ;
-
-  // tooltip management
+    // tooltip management

 #if wxUSE_TOOLTIPS
     wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }
 #if wxUSE_TOOLTIPS
     wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }


@@ -142,16 +113,21 @@ public:
 #endif // tooltips
 
 protected:
 #endif // tooltips
 
 protected:

-  wxMenuBar *           m_frameMenuBar;
-  wxStatusBar *         m_frameStatusBar;
-  wxIcon                m_icon;
+    // common part of all ctors
+    void Init();
+
+    // override base class virtuals
+    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoSetClientSize(int width, int height);
+
+protected:

   bool                  m_iconized;
   bool                  m_iconized;

-  static bool           m_useNativeStatusBar;
-#if wxUSE_TOOLBAR
-  wxToolBar *           m_frameToolBar ;
-#endif
+#if wxUSE_STATUSBAR
+    static bool           m_useNativeStatusBar;
+#endif // wxUSE_STATUSBAR

 
 

-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif