wxCALLBACK added, wxCOMPFUNC_CONV moved to defs.h

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index efa973ec85153c6eb52a7619dc5c07e7f9022d1c..722f4bf695e51dfa7ab20bb4058f98bc95bfb9d6 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -13,7 +13,7 @@
 #define _WX_FRAME_H_
 
 #ifdef __GNUG__
-#pragma interface "frame.h"
+    #pragma interface "frame.h"
 #endif
 
 #include "wx/window.h"
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxFrame : public wxWindow
 {
-DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:
     wxFrame();
@@ -68,24 +68,25 @@ public:
 
     bool Show(bool show);
 
+    void DetachMenuBar();
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
-    virtual wxMenuBar *GetMenuBar() const ;
+    virtual wxMenuBar *GetMenuBar() const;
 
-    // Set title
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const ;
+    // Call this to simulate a menu command
+    bool Command(int id) { return ProcessCommand(id); }
 
-    void Centre(int direction = wxBOTH);
+    // process menu command: returns TRUE if processed
+    bool ProcessCommand(int id);
 
-    // Call this to simulate a menu command
-    virtual void Command(int id);
-    virtual void ProcessCommand(int id);
+    // make the window modal (all other windows unresponsive)
+    virtual void MakeModal(bool modal = TRUE);
 
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 
     // Toolbar
+#if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
@@ -96,7 +97,9 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
 
+#if wxUSE_STATUSBAR
     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
@@ -122,17 +125,15 @@ public:
     // 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();
+#endif // wxUSE_STATUSBAR
 
     // Iconize
     virtual void Iconize(bool iconize);
 
-    virtual bool IsIconized() const ;
+    virtual bool IsIconized() const;
 
     // Is it maximized?
-    virtual bool IsMaximized() const ;
+    virtual bool IsMaximized() const;
 
     // Compatibility
     bool Iconized() const { return IsIconized(); }
@@ -147,7 +148,7 @@ public:
     void DoMenuUpdates();
     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)
@@ -155,19 +156,15 @@ public:
 
     // Implementation only from here
         // event handlers
-    bool MSWOnPaint();
-    WXHICON MSWOnQueryDragIcon();
-    bool MSWOnSize(int x, int y, WXUINT flag);
-    bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    bool MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
-    bool MSWProcessMessage(WXMSG *msg);
-    bool MSWTranslateMessage(WXMSG *msg);
-    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);
-
+    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 wxChar *wclass,
+                   wxWindow *wx_win, const wxChar *title,
+                   int x, int y, int width, int height, long style);
+
   // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
@@ -177,28 +174,38 @@ public:
 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 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);
 
+    // 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;
-    wxToolBar *           m_frameToolBar ;
+
+#if wxUSE_STATUSBAR
+    wxStatusBar *         m_frameStatusBar;
 
     static bool           m_useNativeStatusBar;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    wxToolBar *           m_frameToolBar;
+#endif // wxUSE_TOOLBAR
 
 private:
 #if wxUSE_TOOLTIPS