1. moved m_majorDim duplicated in many ports to wxRadioBoxBase

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

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index f92f7196fcaf0dbfe3aa73397ef937e8af797589..104a622b0fc717625b17e7e1ce24e2e1c6be7129 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -12,10 +12,6 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "frame.h"
-#endif
-

 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"


@@ -59,13 +55,13 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    // override some more virtuals
-    virtual bool Enable(bool enable = TRUE) ;
-

     // 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;
 
     // 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;
 

+    // override some more virtuals
+    virtual bool Enable(bool enable = TRUE) ;
+

     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);


@@ -77,6 +73,7 @@ public:
                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();
                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();

+    virtual void SetToolBar(wxToolBar *toolbar);

 #endif // wxUSE_TOOLBAR
 
     // Status bar
 #endif // wxUSE_TOOLBAR
 
     // Status bar


@@ -115,6 +112,8 @@ protected:
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 

+    virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)