use generic timer in wxMGL and wxX11

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 35a04ee61b6c5c33ca097b6afa905c4f446670da..a181bba996084f7ed949eba8d5d2573be0384047 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     19.05.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -20,26 +20,69 @@
 // wxFrame
 // ----------------------------------------------------------------------------
 
 // wxFrame
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxFrame();
+    wxFrame() {}

     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,

-            const wxString& name = wxFrameNameStr);
+            const wxString& name = wxFrameNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);

 
     virtual wxPoint GetClientAreaOrigin() const;
 
     virtual wxPoint GetClientAreaOrigin() const;

+    virtual bool Enable(bool enable = TRUE);
+
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    // create main toolbar bycalling OnCreateToolBar()
+    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+    virtual int GetMinWidth() const;
+    virtual int GetMinHeight() const;

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

+    // sends wxSizeEvent to itself (used after attaching xxxBar)
+    void SendSizeEvent();
+
+    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoSetClientSize(int width, int height);
+

 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar();
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar();

+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    // override to update statusbar position when the frame size changes
+    virtual void PositionStatusBar();

 #endif // wxUSE_MENUS
 
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_MENUS
 
     DECLARE_EVENT_TABLE()