some very minor fixes (I don't even remember what exactly)

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 9da07a884c7ab91866da304d54340524961f3918..ed28cd8448a5c410194e3ae6f77559a4ccc38afb 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -6,147 +6,202 @@
 // 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 __FRAMEH__
-#define __FRAMEH__
+#ifndef _WX_FRAME_H_
+#define _WX_FRAME_H_

 
 #ifdef __GNUG__
 #pragma interface "frame.h"
 #endif
 
 #include "wx/window.h"
 
 #ifdef __GNUG__
 #pragma interface "frame.h"
 #endif
 
 #include "wx/window.h"

+#include "wx/toolbar.h"
+#include "wx/msw/accel.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;

+WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;

 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 

-class WXDLLEXPORT wxFrame: public wxWindow {
-
-  DECLARE_DYNAMIC_CLASS(wxFrame)
+class WXDLLEXPORT wxFrame : public wxWindow
+{
+DECLARE_DYNAMIC_CLASS(wxFrame)

 
 public:
 
 public:

-  wxFrame(void);
-  inline 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)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
+    wxFrame();
+    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)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    ~wxFrame();
+
+    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 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 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);

 
 

-  ~wxFrame(void);
+    bool Show(bool show);

 
 

-  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);
+    // Set menu bar
+    void SetMenuBar(wxMenuBar *menu_bar);
+    virtual wxMenuBar *GetMenuBar() const ;

 
 

-  virtual bool Destroy(void);
-  void SetClientSize(int width, int height);
-  void GetClientSize(int *width, int *height) const;
+    // Set title
+    void SetTitle(const wxString& title);
+    wxString GetTitle() const ;

 
 

-  void GetSize(int *width, int *height) const ;
-  void GetPosition(int *x, int *y) const ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    void Centre(int direction = wxBOTH);

 
 

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

 
 

-  void OnSize(wxSizeEvent& event);
-  void OnMenuHighlight(wxMenuEvent& event);
-  void OnActivate(wxActivateEvent& event);
-  void OnIdle(wxIdleEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
+    // Set icon
+    virtual void SetIcon(const wxIcon& icon);

 
 

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

 
 

-  // Set menu bar
-  void SetMenuBar(wxMenuBar *menu_bar);
-  virtual wxMenuBar *GetMenuBar(void) const ;
+    virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);

 
 

-  // Set title
-  void SetTitle(const wxString& title);
-  wxString GetTitle(void) const ;
+    virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+    virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }

 
 

-  void Centre(int direction = wxBOTH);
+    virtual void PositionToolBar();

 
 

-  // Call this to simulate a menu command
-  virtual void Command(int id);
-  virtual void ProcessCommand(int id);
+    // Status bar
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);

 
 

-  // Set icon
-  virtual void SetIcon(const wxIcon& icon);
+    wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+    void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }

 
 

-  // Create status line
-  virtual bool CreateStatusBar(int number=1);
-  inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+    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 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(void) { 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(void);
+    // Fit frame around subwindows
+    virtual void Fit();

 
 

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

 
 

-  virtual bool IsIconized(void) const ;
+    virtual bool IsIconized() const ;

 
 

-  // Compatibility
-  inline bool Iconized(void) const { return IsIconized(); }
+    // Is it maximized?
+    virtual bool IsMaximized() const ;

 
 

-  virtual void Maximize(bool maximize);
-  virtual bool LoadAccelerators(const wxString& table);
+    // Compatibility
+    bool Iconized() const { return IsIconized(); }

 
 

-  virtual void PositionStatusBar(void);
-  virtual wxStatusBar *OnCreateStatusBar(int number);
+    virtual void Maximize(bool maximize);
+    //  virtual bool LoadAccelerators(const wxString& table);

 
 

-  // Query app for menu item updates (called from OnIdle)
-  void DoMenuUpdates(void);
-  void DoMenuUpdates(wxMenu* menu);
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
 

-  WXHMENU GetWinMenu(void) const ;
+    // Query app for menu item updates (called from OnIdle)
+    void DoMenuUpdates();
+    void DoMenuUpdates(wxMenu* menu);

 
 

-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    WXHMENU GetWinMenu() const ;

 
 

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

                    int x, int y, int width, int height, long style);
 
                    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; }
+#endif // tooltips
+

 protected:
 protected:

-  wxMenuBar *           m_frameMenuBar;
-  wxStatusBar *         m_frameStatusBar;
-  wxIcon                m_icon;
-  bool                  m_iconized;
-  WXHICON               m_defaultIcon;
-  static bool           m_useNativeStatusBar;
-
-  DECLARE_EVENT_TABLE()
+    // propagate our state change to all child frames
+    void IconizeChildFrames(bool bIconize);
+
+    wxMenuBar *           m_frameMenuBar;
+    wxStatusBar *         m_frameStatusBar;
+    wxIcon                m_icon;
+    bool                  m_iconized;
+    WXHICON               m_defaultIcon;
+    wxToolBar *           m_frameToolBar ;
+
+    static bool           m_useNativeStatusBar;
+
+#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()

 };
 
 #endif
 };
 
 #endif

-    // __FRAMEH__
+    // _WX_FRAME_H_