Augmented version to b5

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index ed28cd8448a5c410194e3ae6f77559a4ccc38afb..64e30f3e9b0e05e53785fdde5cf5f9a9d5a3b093 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -13,23 +13,24 @@
 #define _WX_FRAME_H_
 
 #ifdef __GNUG__
 #define _WX_FRAME_H_
 
 #ifdef __GNUG__

-#pragma interface "frame.h"
+    #pragma interface "frame.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/msw/accel.h"
 #endif
 
 #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 wxFrame : public wxWindow
 {
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxFrame : public wxWindow
 {

-DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 
 public:
     wxFrame();
 
 public:
     wxFrame();


@@ -56,12 +57,7 @@ public:
 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 

-    void GetClientSize(int *width, int *height) const;
-    void GetSize(int *width, int *height) const ;
-    void GetPosition(int *x, int *y) const ;
-

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

-

     virtual void ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);
     virtual void ScreenToClient(int *x, int *y) const;
 
     void OnSize(wxSizeEvent& event);


@@ -74,17 +70,13 @@ public:
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);

-    virtual wxMenuBar *GetMenuBar() const ;
-
-    // Set title
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const ;
-
-    void Centre(int direction = wxBOTH);
+    virtual wxMenuBar *GetMenuBar() const;

 
     // Call this to simulate a menu command
 
     // Call this to simulate a menu command

-    virtual void Command(int id);
-    virtual void ProcessCommand(int id);
+    bool Command(int id) { return ProcessCommand(id); }
+
+    // process menu command: returns TRUE if processed
+    bool ProcessCommand(int id);

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


@@ -127,16 +119,13 @@ public:
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
 
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
 

-    // 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?
 
     // Is it maximized?

-    virtual bool IsMaximized() const ;
+    virtual bool IsMaximized() const;

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


@@ -149,9 +138,9 @@ public:
 
     // 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 { return m_hMenu; }

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


@@ -159,47 +148,59 @@ public:
 
     // Implementation only from here
         // event handlers
 
     // Implementation only from here
         // event handlers

-    bool MSWOnPaint();
-    WXHICON MSWOnQueryDragIcon();
-    void MSWOnSize(int x, int y, WXUINT flag);
-    bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    bool MSWOnClose();
-    void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
-    bool MSWProcessMessage(WXMSG *msg);
-    bool MSWTranslateMessage(WXMSG *msg);
-    void MSWCreate(int id, wxWindow *parent, const char *wclass,
+    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,
                    int x, int y, int width, int height, long style);
 
   // tooltip management
 #if wxUSE_TOOLTIPS
                    wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 
   // tooltip management
 #if wxUSE_TOOLTIPS

-  WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-  void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
+    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }

 #endif // tooltips
 
 protected:
 #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);
+
+    // a plug in for MDI frame classes which need to do something special when
+    // the menubar is set
+    virtual void InternalSetMenuBar();
+

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

+    // we add menu bar accel processing
+    bool MSWTranslateMessage(WXMSG* pMsg);
+
+    // 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;
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;
     wxIcon                m_icon;
     bool                  m_iconized;
     WXHICON               m_defaultIcon;

-    wxToolBar *           m_frameToolBar ;
+    wxToolBar *           m_frameToolBar;

 
     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
 

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

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };