Small changes after Robert's edits

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

diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h
index 03ca33c3864ed7436af319e01bfa38b37d4504b3..70247ae171f0b631d791644a3337d7264fa8e56c 100644 (file)
--- a/include/wx/qt/frame.h
+++ b/include/wx/qt/frame.h
@@ -1,112 +1,156 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h

-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:     wxWindows licence
+// Purpose:     wxFrame class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
+#ifndef _WX_FRAME_H_
+#define _WX_FRAME_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

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

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/window.h"
 #include "wx/window.h"

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

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMDIChildFrame;
-class wxMDIClientWindow;
-class wxMenu;
-class wxMenuBar;
-class wxToolBar;
-class wxStatusBar;
-
-class wxFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;

 
 

-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+class WXDLLEXPORT wxMenuBar;
+class WXDLLEXPORT wxStatusBar;

 
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+class WXDLLEXPORT wxFrame: public wxWindow {

 
 

-class wxFrame: public wxWindow
-{

   DECLARE_DYNAMIC_CLASS(wxFrame)
   DECLARE_DYNAMIC_CLASS(wxFrame)

-public:

 
 

+public:

   wxFrame();
   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 );
-  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 );
+  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();

-  bool Destroy();

 
 

-  virtual bool Show( bool show );
-  virtual void Enable( bool enable );
+  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 SetClientSize(int width, int height);
+  void GetClientSize(int *width, int *height) 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);
+
+  virtual bool OnClose();
+
+  void OnSize(wxSizeEvent& event);
+  void OnMenuHighlight(wxMenuEvent& event);
+  void OnActivate(wxActivateEvent& event);
+  void OnIdle(wxIdleEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
+
+  bool Show(bool show);
+
+  // Set menu bar
+  void SetMenuBar(wxMenuBar *menu_bar);
+  virtual wxMenuBar *GetMenuBar() const ;
+
+  // Set title
+  void SetTitle(const wxString& title);
+  wxString GetTitle() const ;

 
 

-  virtual void GetClientSize( int *width, int *height ) const;
-  
-    // set minimal/maxmimal size for the frame
-  virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
+  void Centre(int direction = wxBOTH);

 
 

+  // Call this to simulate a menu command
+  virtual void Command(int id);
+  virtual void ProcessCommand(int id);
+
+  // Set icon
+  virtual void SetIcon(const wxIcon& icon);
+
+  // Create status line

   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");

-  virtual wxStatusBar *GetStatusBar();
-  virtual void SetStatusText( const wxString &text, int number = 0 );
-  virtual void SetStatusWidths( int n, int *width );
-
-  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, 
-                                    const wxString& name = wxToolBarNameStr);
-  virtual wxToolBar *GetToolBar();
-  
-  virtual void SetMenuBar( wxMenuBar *menuBar );
-  virtual wxMenuBar *GetMenuBar();
-
-  virtual void SetTitle( const wxString &title );
-  virtual wxString GetTitle() const { return m_title; }
-  
-  virtual void SetIcon( const wxIcon &icon );
-
-  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-  void OnSize( wxSizeEvent &event );
-  void OnCloseWindow( wxCloseEvent& event );
-  void OnIdle(wxIdleEvent& event);
+  inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+  virtual void PositionStatusBar();
+  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() const { return m_frameToolBar; }
+  virtual void PositionToolBar();
+
+  // 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[]);
+
+  // 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();

 
 

-private:
-  friend  wxWindow;
-  friend  wxMDIChildFrame;
-  friend  wxMDIClientWindow;
+  // Iconize
+  virtual void Iconize(bool iconize);

 
 

-  // update frame's menus (called from OnIdle)
+  virtual bool IsIconized() const ;
+
+  // Compatibility
+  inline bool Iconized() const { return IsIconized(); }
+
+  virtual void Maximize(bool maximize);
+
+  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+
+  // Responds to colour changes
+  void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+  // Query app for menu item updates (called from OnIdle)

   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
 
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
 

-  wxMenuBar    *m_frameMenuBar;
-  wxStatusBar  *m_frameStatusBar;
-  wxToolBar    *m_frameToolBar;
-  int           m_toolBarHeight;
-  wxString      m_title;
-  wxIcon        m_icon;
+  // Checks if there is a toolbar, and returns the first free client position
+  virtual wxPoint GetClientAreaOrigin() const;
+
+protected:
+  wxMenuBar *           m_frameMenuBar;
+  wxStatusBar *         m_frameStatusBar;
+  wxIcon                m_icon;
+  bool                  m_iconized;
+  static bool           m_useNativeStatusBar;
+  wxToolBar *           m_frameToolBar ;
+  wxAcceleratorTable    m_acceleratorTable;

 
   DECLARE_EVENT_TABLE()
 };
 
 
   DECLARE_EVENT_TABLE()
 };
 

-#endif // __GTKFRAMEH__
+#endif
+    // _WX_FRAME_H_