Added wxPropertyGrid::DedicateKey(), which prevents specific key presses from being...

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

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 380fbf624e6db5cfc5c36288d529020196f75315..42c93937485f7796c50b09f2b910fce6e1d9643e 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -23,7 +23,7 @@ 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,7 +59,7 @@ 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);
@@ -77,7 +77,7 @@ public:
     // Status bar
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* OnCreateStatusBar(int number = 1,
-                                           long style = wxST_SIZEGRIP,
+                                           long style = wxSTB_DEFAULT_STYLE,
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
@@ -88,6 +88,9 @@ public:
 
     void PositionBars();
 
+    // osx specific event handling common for all osx-ports
+    virtual void HandleResized( double timestampsec );
+
 protected:
     // common part of all ctors
     void Init();
@@ -108,16 +111,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)
 };