don't eat activation events (replaces patch 1465849)

[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..306c9ff2ecf65f985010096a7584b51e54abe0ce 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -12,17 +12,13 @@
 #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/icon.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -59,13 +55,13 @@ public:
     // 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;
 
+    // override some more virtuals
+    virtual bool Enable(bool enable = TRUE) ;
+
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -76,7 +72,7 @@ public:
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
-    virtual void PositionToolBar();
+    virtual void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
     // Status bar
@@ -85,8 +81,6 @@ public:
                                            long style = wxST_SIZEGRIP,
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
-
-    virtual void PositionStatusBar();
 #endif // wxUSE_STATUSBAR
 
     // tooltip management
@@ -100,10 +94,19 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
+    void PositionBars();
+
 protected:
     // common part of all ctors
     void Init();
 
+#if wxUSE_TOOLBAR
+    virtual void PositionToolBar();
+#endif
+#if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();
+#endif
+
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
@@ -115,6 +118,8 @@ protected:
     // 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)