No changes, just move time functions from wx/stopwatch.h to wx/time.h.

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 0f65132d711cefefae6d85b482fe2f4ac516e9e0..efa94287cb1cf7b94e7a19d0e516a8823d41f9d6 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -17,25 +17,28 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/toplevel.h"      // the base class
 // ----------------------------------------------------------------------------
 
 #include "wx/toplevel.h"      // the base class

+#include "wx/statusbr.h"

 
 // the default names for various classs
 
 // the default names for various classs

-extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];

 
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // wxFrame-specific (i.e. not for wxDialog) styles
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // wxFrame-specific (i.e. not for wxDialog) styles

+//
+// Also see the bit summary table in wx/toplevel.h.

 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent
 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent

-#define wxFRAME_SHAPED          0x0010  // Create a window that is able to be shaped

 
 // ----------------------------------------------------------------------------
 // wxFrame is a top-level window with optional menubar, statusbar and toolbar
 
 // ----------------------------------------------------------------------------
 // wxFrame is a top-level window with optional menubar, statusbar and toolbar


@@ -49,7 +52,7 @@ class WXDLLEXPORT wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow

 {
 public:
     // construction
 {
 public:
     // construction


@@ -71,9 +74,6 @@ public:
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 

-    // sends a size event to the window using its current size -- this has an
-    // effect of refreshing the window layout
-    virtual void SendSizeEvent();

 
     // menu bar functions
     // ------------------
 
     // menu bar functions
     // ------------------


@@ -85,21 +85,29 @@ public:
     // find the item by id in the frame menu bar: this is an internal function
     // and exists mainly in order to be overridden in the MDI parent frame
     // which also looks at its active child menu bar
     // find the item by id in the frame menu bar: this is an internal function
     // and exists mainly in order to be overridden in the MDI parent frame
     // which also looks at its active child menu bar

-    virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
-#endif // wxUSE_MENUS
+    virtual wxMenuItem *FindItemInMenuBar(int menuId) const;

 
 

-    // process menu command: returns true if processed
+    // generate menu command corresponding to the given menu item
+    //
+    // returns true if processed
+    bool ProcessCommand(wxMenuItem *item);
+
+    // generate menu command corresponding to the given menu command id
+    //
+    // returns true if processed

     bool ProcessCommand(int winid);
     bool ProcessCommand(int winid);

+#else
+    bool ProcessCommand(int WXUNUSED(winid)) { return false; }
+#endif // wxUSE_MENUS

 
     // status bar functions
     // --------------------
 #if wxUSE_STATUSBAR
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,
 
     // status bar functions
     // --------------------
 #if wxUSE_STATUSBAR
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,

-                                         long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
+                                         long style = wxSTB_DEFAULT_STYLE,

                                          wxWindowID winid = 0,
                                          wxWindowID winid = 0,

-                                         const wxString& name =
-                                            wxStatusLineNameStr);
+                                         const wxString& name = wxStatusLineNameStr);

     // return a new status bar
     virtual wxStatusBar *OnCreateStatusBar(int number,
                                            long style,
     // return a new status bar
     virtual wxStatusBar *OnCreateStatusBar(int number,
                                            long style,


@@ -162,17 +170,6 @@ public:
     // Implement internal behaviour (menu updating on some platforms)
     virtual void OnInternalIdle();
 
     // Implement internal behaviour (menu updating on some platforms)
     virtual void OnInternalIdle();
 

-    // if there is no real wxTopLevelWindow on this platform we have to define
-    // some wxTopLevelWindowBase pure virtual functions here to avoid breaking
-    // old ports (wxMotif) which don't define them in wxFrame
-#ifndef wxTopLevelWindowNative
-    virtual bool ShowFullScreen(bool WXUNUSED(show),
-                                long WXUNUSED(style) = wxFULLSCREEN_ALL)
-        { return false; }
-    virtual bool IsFullScreen() const
-        { return false; }
-#endif // no wxTopLevelWindowNative
-

 #if wxUSE_MENUS || wxUSE_TOOLBAR
     // show help text for the currently selected menu or toolbar item
     // (typically in the status bar) or hide it and restore the status bar text
 #if wxUSE_MENUS || wxUSE_TOOLBAR
     // show help text for the currently selected menu or toolbar item
     // (typically in the status bar) or hide it and restore the status bar text


@@ -180,6 +177,11 @@ public:
     virtual void DoGiveHelp(const wxString& text, bool show);
 #endif
 
     virtual void DoGiveHelp(const wxString& text, bool show);
 #endif
 

+    virtual bool IsClientAreaChild(const wxWindow *child) const
+    {
+        return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
+    }
+

 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------
 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------


@@ -190,10 +192,6 @@ protected:
 
     // test whether this window makes part of the frame
     virtual bool IsOneOfBars(const wxWindow *win) const;
 
     // test whether this window makes part of the frame
     virtual bool IsOneOfBars(const wxWindow *win) const;

-    virtual bool IsClientAreaChild(const wxWindow *child) const
-    {
-        return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
-    }

 
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes
 
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes


@@ -213,6 +211,9 @@ protected:
 #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
     // the saved status bar text overwritten by DoGiveHelp()
     wxString m_oldStatusText;
 #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
     // the saved status bar text overwritten by DoGiveHelp()
     wxString m_oldStatusText;

+
+    // the last help string we have shown in the status bar
+    wxString m_lastHelpShown;

 #endif
 
 #if wxUSE_STATUSBAR
 #endif
 
 #if wxUSE_STATUSBAR


@@ -243,7 +244,7 @@ protected:
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_MENUS && wxUSE_STATUSBAR
 
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_MENUS && wxUSE_STATUSBAR
 

-    DECLARE_NO_COPY_CLASS(wxFrameBase)
+    wxDECLARE_NO_COPY_CLASS(wxFrameBase);

 };
 
 // include the real class declaration
 };
 
 // include the real class declaration


@@ -261,7 +262,7 @@ protected:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
     #elif defined(__WXMOTIF__)
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)

-        #include "wx/mac/frame.h"
+        #include "wx/osx/frame.h"

     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)