Added

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index d039be9de4cfc2fdb0f370b8670738b48f9720df..efa973ec85153c6eb52a7619dc5c07e7f9022d1c 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_


@@ -19,10 +19,11 @@
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/msw/accel.h"
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/msw/accel.h"

+#include "wx/icon.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
+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 wxMenuBar;
 class WXDLLEXPORT wxStatusBar;


@@ -43,9 +44,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
     {
         Create(parent, id, title, pos, size, style, name);
     }

-    
+

     ~wxFrame();
     ~wxFrame();

-    
+

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


@@ -53,54 +54,37 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);

-    
+

     virtual bool Destroy();
     virtual bool Destroy();

-    
-    void SetClientSize(int width, int height);
-    void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
-    
-    void GetClientSize(int *width, int *height) const;
-    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-    
-    void GetSize(int *width, int *height) const ;
-    wxSize GetSize() const { return wxWindow::GetSize(); }
-    
-    void GetPosition(int *x, int *y) const ;
-    wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-    
-    virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    
+

     virtual void ClientToScreen(int *x, int *y) const;
     virtual void ClientToScreen(int *x, int *y) const;

-    

     virtual void ScreenToClient(int *x, int *y) const;
     virtual void ScreenToClient(int *x, int *y) const;

-    
-    virtual bool OnClose();
-    
+

     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnCloseWindow(wxCloseEvent& event);

-    
+

     bool Show(bool show);
     bool Show(bool show);

-    
+

     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const ;
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const ;

-    
+

     // Set title
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
     // Set title
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;

-    
+

     void Centre(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);

-    
+

     // Call this to simulate a menu command
     virtual void Command(int id);
     virtual void ProcessCommand(int id);
     // Call this to simulate a menu command
     virtual void Command(int id);
     virtual void ProcessCommand(int id);

-    
+

     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     // Set icon
     virtual void SetIcon(const wxIcon& icon);

-    
+

     // Toolbar
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
     // Toolbar
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,


@@ -112,7 +96,7 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();

-    
+

     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,


@@ -127,72 +111,86 @@ public:
                                            long style,
                                            wxWindowID id,
                                            const wxString& name);
                                            long style,
                                            wxWindowID id,
                                            const wxString& name);

-    
+

     // Set status line text
     virtual void SetStatusText(const wxString& text, int number = 0);
     // 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[]);
     // Set status line widths
     virtual void SetStatusWidths(int n, const int widths_field[]);

-    
+

     // Hint to tell framework which status bar to use
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
     // Hint to tell framework which status bar to use
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };

-    
+

     // Fit frame around subwindows
     virtual void Fit();
     // Fit frame around subwindows
     virtual void Fit();

-    
+

     // Iconize
     virtual void Iconize(bool iconize);
     // Iconize
     virtual void Iconize(bool iconize);

-    
+

     virtual bool IsIconized() const ;
     virtual bool IsIconized() const ;

-    
+

     // Is it maximized?
     virtual bool IsMaximized() const ;
     // Is it maximized?
     virtual bool IsMaximized() const ;

-    
+

     // Compatibility
     bool Iconized() const { return IsIconized(); }
     // Compatibility
     bool Iconized() const { return IsIconized(); }

-    
+

     virtual void Maximize(bool maximize);
     //  virtual bool LoadAccelerators(const wxString& table);
     virtual void Maximize(bool maximize);
     //  virtual bool LoadAccelerators(const wxString& table);

-    
+

     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);

-    
+

     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();
     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();

-    void DoMenuUpdates(wxMenu* menu);
-    
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+

     WXHMENU GetWinMenu() const ;
     WXHMENU GetWinMenu() const ;

-    
+

     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;

-    
+

     // Implementation only from here
         // event handlers
     bool MSWOnPaint();
     WXHICON MSWOnQueryDragIcon();
     // Implementation only from here
         // event handlers
     bool MSWOnPaint();
     WXHICON MSWOnQueryDragIcon();

-    void MSWOnSize(int x, int y, WXUINT flag);
+    bool MSWOnSize(int x, int y, WXUINT flag);

     bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);

-    bool MSWOnClose();
-    void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
+    bool MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);

     bool MSWProcessMessage(WXMSG *msg);
     bool MSWTranslateMessage(WXMSG *msg);
     bool MSWProcessMessage(WXMSG *msg);
     bool MSWTranslateMessage(WXMSG *msg);

-    void MSWCreate(int id, wxWindow *parent, const char *wclass,
+    bool MSWCreate(int id, wxWindow *parent, const char *wclass,

                    wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 
                    wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 

-        // tooltip management
+    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
+
+  // 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:

+    // 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);
+

     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);

-    
+
+    // window proc for the frames
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+

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


@@ -202,11 +200,11 @@ protected:
 
     static bool           m_useNativeStatusBar;
 
 
     static bool           m_useNativeStatusBar;
 

+private:

 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 

-private:

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };