test

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 36458bf83a49dc41367727408fcebe0017bc6491..81f12ec2bc33c0c0036ddab9e759b0dc371fb8cd 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFrame class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFrame class
 // Author:      Julian Smart
 // Modified by:


@@ -16,37 +16,24 @@
     #pragma interface "frame.h"
 #endif
 
     #pragma interface "frame.h"
 #endif
 

-#include "wx/window.h"
-#include "wx/toolbar.h"
-#include "wx/msw/accel.h"
-#include "wx/icon.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
-
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
-
-class WXDLLEXPORT wxFrame : public wxWindow
+class WXDLLEXPORT wxFrame : public wxFrameBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxFrame)
-

 public:
 public:

-    wxFrame();
+    // construction
+    wxFrame() { Init(); }

     wxFrame(wxWindow *parent,
     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)
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE,
+            const wxString& name = wxFrameNameStr)

     {
     {

+        Init();
+

         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxFrame();
-

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,


@@ -55,90 +42,55 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    virtual bool Destroy();
-
-    virtual void ClientToScreen(int *x, int *y) const;
-    virtual void ScreenToClient(int *x, int *y) const;
-
-    void OnSize(wxSizeEvent& event);
-    void OnMenuHighlight(wxMenuEvent& event);
-    void OnActivate(wxActivateEvent& event);
-    void OnIdle(wxIdleEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    bool Show(bool show);
+    virtual ~wxFrame();

 
 

-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
-    virtual wxMenuBar *GetMenuBar() const;
+    // implement base class pure virtuals
+    virtual void Maximize(bool maximize = TRUE);
+    virtual bool IsMaximized() const;
+    virtual void Iconize(bool iconize = TRUE);
+    virtual bool IsIconized() const;
+    virtual void Restore();
+    virtual void SetMenuBar(wxMenuBar *menubar);
+    virtual void SetIcon(const wxIcon& icon);

 
 

-    // Call this to simulate a menu command
-    bool Command(int id) { ProcessCommand(id); }
+    // implementation only from now on
+    // -------------------------------

 
 

-    // process menu command: returns TRUE if processed
-    bool ProcessCommand(int id);
+    // override some more virtuals
+    virtual bool Show(bool show = TRUE);

 
 

-    // Set icon
-    virtual void SetIcon(const wxIcon& icon);
+    // event handlers
+    void OnActivate(wxActivateEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
     // Toolbar
 
     // Toolbar

+#if wxUSE_TOOLBAR

     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 

-    virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
-
-    virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
-    virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
-

     virtual void PositionToolBar();
     virtual void PositionToolBar();

+#endif // wxUSE_TOOLBAR

 
     // Status bar
 
     // Status bar

-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
-
-    wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
-    void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
+                                           long style = wxST_SIZEGRIP,
+                                           wxWindowID id = 0,
+                                           const wxString& name = wxStatusLineNameStr);

 
     virtual void PositionStatusBar();
 
     virtual void PositionStatusBar();

-    virtual wxStatusBar *OnCreateStatusBar(int number,
-                                           long style,
-                                           wxWindowID id,
-                                           const wxString& name);
-
-    // Set status line text
-    virtual void SetStatusText(const wxString& text, int number = 0);

 
 

-    // Set status line widths
-    virtual void SetStatusWidths(int n, const int widths_field[]);
+    // Hint to tell framework which status bar to use: the default is to use
+    // native one for the platforms which support it (Win32), the generic one
+    // otherwise

 
 

-    // Hint to tell framework which status bar to use

     // TODO: should this go into a wxFrameworkSettings class perhaps?
     // TODO: should this go into a wxFrameworkSettings class perhaps?

-    static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
-    static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
-
-    // Iconize
-    virtual void Iconize(bool iconize);
-
-    virtual bool IsIconized() const;
-
-    // Is it maximized?
-    virtual bool IsMaximized() const;
-
-    // Compatibility
-    bool Iconized() const { return IsIconized(); }
-
-    virtual void Maximize(bool maximize);
-    //  virtual bool LoadAccelerators(const wxString& table);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Query app for menu item updates (called from OnIdle)
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+    static void UseNativeStatusBar(bool useNative)
+        { m_useNativeStatusBar = useNative; };
+    static bool UsesNativeStatusBar()
+        { return m_useNativeStatusBar; };
+#endif // wxUSE_STATUSBAR

 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 


@@ -146,34 +98,42 @@ public:
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
 
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
 

-    // Implementation only from here
-        // event handlers
+    // event handlers

     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 

-    bool MSWCreate(int id, wxWindow *parent, const char *wclass,
-                   wxWindow *wx_win, const char *title,
+    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
+                   wxWindow *wx_win, const wxChar *title,

                    int x, int y, int width, int height, long style);
 
                    int x, int y, int width, int height, long style);
 

-  // tooltip management
+    // tooltip management

 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:

+    // common part of all ctors
+    void Init();
+
+    // common part of Iconize(), Maximize() and Restore()
+    void DoShowWindow(int nShowCmd);
+

     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;
 
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

     virtual void DoSetClientSize(int width, int height);
 
     virtual void DoSetClientSize(int width, int height);
 

+    virtual void DoClientToScreen(int *x, int *y) const;
+    virtual void DoScreenToClient(int *x, int *y) const;
+
+    // helper
+    void DetachMenuBar();
+

     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();


@@ -187,14 +147,12 @@ protected:
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-    wxMenuBar *           m_frameMenuBar;
-    wxStatusBar *         m_frameStatusBar;
-    wxIcon                m_icon;

     bool                  m_iconized;
     WXHICON               m_defaultIcon;
     bool                  m_iconized;
     WXHICON               m_defaultIcon;

-    wxToolBar *           m_frameToolBar;

 
 

+#if wxUSE_STATUSBAR

     static bool           m_useNativeStatusBar;
     static bool           m_useNativeStatusBar;

+#endif // wxUSE_STATUSBAR

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS


@@ -202,6 +160,7 @@ private:
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif