more fixes, printing works quite fine now

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 664449d5b8eb2187feedef734834c04975011306..394e658f5909a3d30722c457e6455bb9e69197d3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -9,16 +9,19 @@
 // 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;

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


@@ -58,6 +61,8 @@ public:
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 

+  virtual bool OnClose(void);
+

   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);


@@ -84,8 +89,21 @@ public:
   virtual void SetIcon(const wxIcon& icon);
 
   // Create status line
   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 = "statusBar");

   inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
   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, 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);
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);


@@ -110,10 +128,10 @@ public:
   inline bool Iconized(void) const { return IsIconized(); }
 
   virtual void Maximize(bool maximize);
   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);
 
   // Query app for menu item updates (called from OnIdle)
   void DoMenuUpdates(void);


@@ -121,8 +139,8 @@ public:
 
   WXHMENU GetWinMenu(void) const ;
 
 
   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);
 
   // Handlers
   bool MSWOnPaint(void);


@@ -132,19 +150,24 @@ public:
   bool MSWOnClose(void);
   void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
   bool MSWProcessMessage(WXMSG *msg);
   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:
   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;
   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
 
   DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // __FRAMEH__
+    // _WX_FRAME_H_