Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 1335647d82422782f8637e0bfccd4b9dd179f6c6..207bf0d6b0b9b3a4c87cac82a49806147211f75b 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -16,7 +16,7 @@
 // wxFrame
 // ----------------------------------------------------------------------------
 
 // wxFrame
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxFrame() {}
 {
 public:
     wxFrame() {}


@@ -44,7 +44,7 @@ public:
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number = 1,
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(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


@@ -56,11 +56,7 @@ public:
                                      const wxString& name = wxToolBarNameStr);
 #endif // wxUSE_TOOLBAR
 
                                      const wxString& name = wxToolBarNameStr);
 #endif // wxUSE_TOOLBAR
 

-    virtual int GetMinWidth() const;
-    virtual int GetMinHeight() const;
-
-    // sends wxSizeEvent to itself (used after attaching xxxBar)
-    virtual void SendSizeEvent();
+    virtual wxSize GetMinSize() const;

 
 protected:
     void OnSize(wxSizeEvent& event);
 
 protected:
     void OnSize(wxSizeEvent& event);