Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 380fbf624e6db5cfc5c36288d529020196f75315..eaea567261999902f4fb3683147bd9ce9cfe2df4 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.h
+// Name:        wx/osx/frame.h

 // Purpose:     wxFrame class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFrame class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,18 +12,13 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

-#include "wx/window.h"

 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/icon.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_FWD_CORE wxMacToolTip ;
 

-class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase 
+class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase

 {
 public:
     // construction
 {
 public:
     // construction


@@ -59,7 +54,7 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
 
     // override some more virtuals
     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);
 
     // event handlers
     void OnActivate(wxActivateEvent& event);


@@ -77,7 +72,7 @@ public:
     // Status bar
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* OnCreateStatusBar(int number = 1,
     // 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
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR


@@ -88,6 +83,9 @@ public:
 
     void PositionBars();
 
 
     void PositionBars();
 

+    // internal response to size events
+    virtual void MacOnInternalSize() { PositionBars(); }
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -108,16 +106,11 @@ protected:
     virtual void AttachMenuBar(wxMenuBar *menubar);
 #endif
 
     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 ;
 
     // 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)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };