X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f63ec3f93070e6824da775cf8d2565a025c2406..77436c4cbac2269e564dc4fcf4494a58feca0af4:/include/wx/motif/mdi.h?ds=sidebyside

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 557f0044db..62d6efb7d7 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -65,20 +65,15 @@ public:
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);
+  void OnMenuHighlight(wxMenuEvent& event);
 
   void SetMenuBar(wxMenuBar *menu_bar);
 
-  // Gets the size available for subwindows after menu size, toolbar size
-  // and status bar size have been subtracted. If you want to manage your own
-  // toolbar(s), don't call SetToolBar.
-  void GetClientSize(int *width, int *height) const;
-  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-
   // Get the active MDI child window
   wxMDIChildFrame *GetActiveChild() const ;
 
   // Get the client window
-  inline wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
+  wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
 
   // Create the client window class (don't Create the window,
   // just return a new class)
@@ -104,6 +99,16 @@ public:
   // Redirect events to active child first
   virtual bool ProcessEvent(wxEvent& event);
 
+protected:
+  virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+  virtual void DoSetClientSize(int width, int height);
+
+  // Gets the size available for subwindows after menu size, toolbar size
+  // and status bar size have been subtracted. If you want to manage your own
+  // toolbar(s), don't call SetToolBar.
+  void DoGetClientSize(int *width, int *height) const;
 
 protected:
 
@@ -117,89 +122,84 @@ DECLARE_EVENT_TABLE()
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-public:
 
-  wxMDIChildFrame();
-  inline wxMDIChildFrame(wxMDIParentFrame *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);
-  }
-
-  ~wxMDIChildFrame();
-
-  bool Create(wxMDIParentFrame *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE,
-           const wxString& name = wxFrameNameStr);
-
-  // Set menu bar
-  void SetMenuBar(wxMenuBar *menu_bar);
-  void SetTitle(const wxString& title);
-
-  void SetClientSize(int width, int height);
-  void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
-
-  void GetClientSize(int *width, int *height) const;
-  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
-
-  void GetSize(int *width, int *height) const;
-  wxSize GetSize() const { return wxWindow::GetSize(); }
-
-  void GetPosition(int *x, int *y) const ;
-  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-
-  // Set icon
-  virtual void SetIcon(const wxIcon& icon);
-
-  // Override wxFrame operations
-  void CaptureMouse();
-  void ReleaseMouse();
-  void Raise();
-  void Lower(void);
-  void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
-
-  // MDI operations
-  virtual void Maximize();
-  inline void Minimize() { Iconize(TRUE); };
-  virtual void Iconize(bool iconize);
-  virtual void Restore();
-  virtual void Activate();
-  virtual bool IsIconized() const ;
-
-  // Is the frame maximized? Returns TRUE for
-  // wxMDIChildFrame due to the tabbed implementation.
-  virtual bool IsMaximized(void) const ;
-
-  bool Show(bool show);
-
-  inline WXWidget GetMainWidget() const { return m_mainWidget; };
-  inline WXWidget GetTopWidget() const { return m_mainWidget; };
-  inline WXWidget GetClientWidget() const { return m_mainWidget; };
+public:
+    wxMDIChildFrame();
+    wxMDIChildFrame(wxMDIParentFrame *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);
+    }
+
+    ~wxMDIChildFrame();
+
+    bool Create(wxMDIParentFrame *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE,
+            const wxString& name = wxFrameNameStr);
+
+    // Set menu bar
+    void SetMenuBar(wxMenuBar *menu_bar);
+    void SetTitle(const wxString& title);
+
+    // Set icon
+    virtual void SetIcon(const wxIcon& icon);
+
+    // Override wxFrame operations
+    void CaptureMouse();
+    void ReleaseMouse();
+    void Raise();
+    void Lower(void);
+    void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
+
+    // MDI operations
+    virtual void Maximize();
+    virtual void Maximize(bool WXUNUSED(maximize)) { };
+    inline void Minimize() { Iconize(TRUE); };
+    virtual void Iconize(bool iconize);
+    virtual void Restore();
+    virtual void Activate();
+    virtual bool IsIconized() const ;
+
+    virtual bool IsTopLevel() const { return FALSE; }
+    
+    // Is the frame maximized? Returns TRUE for
+    // wxMDIChildFrame due to the tabbed implementation.
+    virtual bool IsMaximized(void) const ;
+
+    bool Show(bool show);
+
+    WXWidget GetMainWidget() const { return m_mainWidget; };
+    WXWidget GetTopWidget() const { return m_mainWidget; };
+    WXWidget GetClientWidget() const { return m_mainWidget; };
+
+    /*
+       virtual void OnRaise();
+       virtual void OnLower();
+     */
+
+    void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
+    wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
 
-/*
-  virtual void OnRaise();
-  virtual void OnLower();
-*/
+protected:
+    wxMDIParentFrame* m_mdiParentFrame;
 
-  inline void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
-  inline wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 
-protected:
-  wxMDIParentFrame* m_mdiParentFrame;
+    void DoGetClientSize(int *width, int *height) const;
+    void DoGetSize(int *width, int *height) const;
+    void DoGetPosition(int *x, int *y) const ;
 };
 
 /* The client window is a child of the parent MDI frame, and itself
@@ -211,46 +211,39 @@ protected:
 
 class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
 {
-  DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
- public:
-
-  wxMDIClientWindow() ;
-  inline wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
-  {
-      CreateClient(parent, style);
-  }
+DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 
-  ~wxMDIClientWindow();
-
-   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-   void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-   void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
-
-   void SetClientSize(int width, int height);
-   void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
+public:
+    wxMDIClientWindow() ;
+    wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
+    {
+        CreateClient(parent, style);
+    }
 
-   void GetClientSize(int *width, int *height) const;
-   wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
+    ~wxMDIClientWindow();
 
-   void GetSize(int *width, int *height) const ;
-   wxSize GetSize() const { return wxWindow::GetSize(); }
+    // Note: this is virtual, to allow overridden behaviour.
+    virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
-   void GetPosition(int *x, int *y) const ;
-   wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+    // Explicitly call default scroll behaviour
+    void OnScroll(wxScrollEvent& event);
 
-  // Note: this is virtual, to allow overridden behaviour.
-  virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
+    // Implementation
+    void OnPageChanged(wxNotebookEvent& event);
 
-  // Explicitly call default scroll behaviour
-  void OnScroll(wxScrollEvent& event);
+protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 
-  // Implementation
-  void OnPageChanged(wxNotebookEvent& event);
+    void DoGetClientSize(int *width, int *height) const;
+    void DoGetSize(int *width, int *height) const ;
+    void DoGetPosition(int *x, int *y) const ;
 
-protected:
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif