supporting content size scaling (retina display)

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

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index be5e40f6eee60c885640b3dc0fccf41640dd9ace..171fe8ea66800c69ac4095a8882ffd7b29570520 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -12,18 +12,13 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
-
-class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 
-class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase 
+class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
 {
 public:
     // construction
@@ -59,11 +54,12 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
 
     // override some more virtuals
-    virtual bool Enable(bool enable = TRUE) ;
+    virtual bool Enable(bool enable = true) ;
 
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnSize(wxSizeEvent& event);
 
     // Toolbar
 #if wxUSE_TOOLBAR
@@ -88,6 +84,7 @@ public:
 
     void PositionBars();
 
+
 protected:
     // common part of all ctors
     void Init();
@@ -108,16 +105,11 @@ protected:
     virtual void AttachMenuBar(wxMenuBar *menubar);
 #endif
 
-    // osx specific event handling common for all osx-ports
-    virtual void HandleResized( double timestampsec );
-
-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)
 };