wxRadioBox fixed on mac

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

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 143596828acc9c0b33495b14774ed99e0980d9ee..62d6efb7d7e2ac0d178f9c2dfb5ee2eac06f9932 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -65,15 +65,10 @@ public:
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSysColourChanged(wxSysColourChangedEvent& event);

+  void OnMenuHighlight(wxMenuEvent& event);

 
   void SetMenuBar(wxMenuBar *menu_bar);
 
 
   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 active MDI child window
   wxMDIChildFrame *GetActiveChild() const ;
 


@@ -110,6 +105,10 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
   virtual void DoSetClientSize(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:
 
 
 protected:
 


@@ -151,10 +150,6 @@ public:
     void SetMenuBar(wxMenuBar *menu_bar);
     void SetTitle(const wxString& title);
 
     void SetMenuBar(wxMenuBar *menu_bar);
     void SetTitle(const wxString& title);
 

-    void GetClientSize(int *width, int *height) const;
-    void GetSize(int *width, int *height) const;
-    void GetPosition(int *x, int *y) const ;
-

     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 


@@ -174,6 +169,8 @@ public:
     virtual void Activate();
     virtual bool IsIconized() const ;
 
     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 ;
     // Is the frame maximized? Returns TRUE for
     // wxMDIChildFrame due to the tabbed implementation.
     virtual bool IsMaximized(void) const ;


@@ -199,6 +196,10 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);

+
+    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
 };
 
 /* The client window is a child of the parent MDI frame, and itself


@@ -221,10 +222,6 @@ public:
 
     ~wxMDIClientWindow();
 
 
     ~wxMDIClientWindow();
 

-    void GetClientSize(int *width, int *height) const;
-    void GetSize(int *width, int *height) const ;
-    void GetPosition(int *x, int *y) const ;
-

     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 


@@ -240,6 +237,11 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 

+    void DoGetClientSize(int *width, int *height) const;
+    void DoGetSize(int *width, int *height) const ;
+    void DoGetPosition(int *x, int *y) const ;
+
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };