X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b9518ee4a9cb8f6d4934afaed07aea011ec5ab1..e35d0039d37b1b785aab12d8ef55507d7879c232:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 664449d5b8..9038a6e60b 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -9,16 +9,20 @@
 // 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"
+#include "wx/toolbar.h"
+#include "wx/msw/accel.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -51,12 +55,26 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy(void);
+
   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 ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  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 ScreenToClient(int *x, int *y) const;
+
+  virtual bool OnClose(void);
 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
@@ -84,8 +102,23 @@ public:
   virtual void SetIcon(const wxIcon& icon);
 
   // Create status line
-  virtual bool CreateStatusBar(int number=1);
+  virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
+    const wxString& name = wxStatusLineNameStr);
   inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+  inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
+  virtual void PositionStatusBar(void);
+  virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
+    const wxString& name);
+
+  // Create toolbar
+  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);
+  // If made known to the frame, the frame will manage it automatically.
+  virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+  virtual inline wxToolBar *GetToolBar(void) const { return m_frameToolBar; }
+  virtual void PositionToolBar(void);
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
@@ -106,14 +139,17 @@ public:
 
   virtual bool IsIconized(void) const ;
 
+  // Is it maximized?
+  virtual bool IsMaximized(void) const ;
+
   // Compatibility
   inline bool Iconized(void) const { return IsIconized(); }
 
   virtual void Maximize(bool maximize);
-  virtual bool LoadAccelerators(const wxString& table);
+//  virtual bool LoadAccelerators(const wxString& table);
 
-  virtual void PositionStatusBar(void);
-  virtual wxStatusBar *OnCreateStatusBar(int number);
+  // Responds to colour changes
+  void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Query app for menu item updates (called from OnIdle)
   void DoMenuUpdates(void);
@@ -121,8 +157,8 @@ public:
 
   WXHMENU GetWinMenu(void) const ;
 
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+  // Checks if there is a toolbar, and returns the first free client position
+  virtual wxPoint GetClientAreaOrigin() const;
 
   // Handlers
   bool MSWOnPaint(void);
@@ -132,19 +168,24 @@ public:
   bool MSWOnClose(void);
   void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
   bool MSWProcessMessage(WXMSG *msg);
+  bool MSWTranslateMessage(WXMSG *msg);
   void MSWCreate(int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 
 protected:
+  // 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;
   static bool           m_useNativeStatusBar;
+  wxToolBar *           m_frameToolBar ;
 
   DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __FRAMEH__
+    // _WX_FRAME_H_