fixed outdated filenames

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index b8308307e4affb370a96d6ca4e3f666069272988..ac7e48f61c5036e0cadbd20df82c25fb197dfa87 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -20,14 +20,14 @@
     #pragma interface "framebase.h"
 #endif
 
     #pragma interface "framebase.h"
 #endif
 

-#include "wx/window.h"      // the base class
-#include "wx/icon.h"        // for m_icon
+#include "wx/toplevel.h"      // the base class

 
 // the default names for various classs
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 
 // the default names for various classs
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 

+class WXDLLEXPORT wxFrame;

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


@@ -44,11 +44,17 @@ class WXDLLEXPORT wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrameBase : public wxWindow
+// FIXME - temporary hack in absence of wxTLW !!
+#ifndef wxTopLevelWindowNative
+class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase
+#else
+class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
+#endif

 {
 public:
     // construction
     wxFrameBase();
 {
 public:
     // construction
     wxFrameBase();

+    virtual ~wxFrameBase();

 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,
 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,


@@ -61,30 +67,6 @@ public:
     // frame state
     // -----------
 
     // frame state
     // -----------
 

-    // maximize = TRUE => maximize, otherwise - restore
-    virtual void Maximize(bool maximize = TRUE) = 0;
-
-    // undo Maximize() or Iconize()
-    virtual void Restore() = 0;
-
-    // iconize = TRUE => iconize, otherwise - restore
-    virtual void Iconize(bool iconize = TRUE) = 0;
-
-    // return TRUE if the frame is maximized
-    virtual bool IsMaximized() const = 0;
-
-    // return TRUE if the frame is iconized
-    virtual bool IsIconized() const = 0;
-
-    // get the frame icon
-    const wxIcon& GetIcon() const { return m_icon; }
-
-    // set the frame icon
-    virtual void SetIcon(const wxIcon& icon) { m_icon = icon; }
-
-    // make the window modal (all other windows unresponsive)
-    virtual void MakeModal(bool modal = TRUE);
-

     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;


@@ -92,8 +74,10 @@ public:
     // menu bar functions
     // ------------------
 
     // menu bar functions
     // ------------------
 

-    virtual void SetMenuBar(wxMenuBar *menubar) = 0;
+#if wxUSE_MENUS
+    virtual void SetMenuBar(wxMenuBar *menubar);

     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }

+#endif // wxUSE_MENUS

 
     // call this to simulate a menu command
     bool Command(int id) { return ProcessCommand(id); }
 
     // call this to simulate a menu command
     bool Command(int id) { return ProcessCommand(id); }


@@ -143,30 +127,29 @@ public:
     virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 #endif // wxUSE_TOOLBAR
 
     virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 #endif // wxUSE_TOOLBAR
 

-    // old functions, use the new ones instead!
-#if WXWIN_COMPATIBILITY_2
-    bool Iconized() const { return IsIconized(); }
-#endif // WXWIN_COMPATIBILITY_2
-

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    // override some base class virtuals
-    virtual bool Destroy();
-    virtual bool IsTopLevel() const { return TRUE; }
-

     // event handlers
     void OnIdle(wxIdleEvent& event);
     // event handlers
     void OnIdle(wxIdleEvent& event);

-    void OnCloseWindow(wxCloseEvent& event);

     void OnMenuHighlight(wxMenuEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);

-    void OnSize(wxSizeEvent& event);
-    // this should go away, but for now it's called from docview.cpp,
-    // so should be there for all platforms
-    void OnActivate(wxActivateEvent &WXUNUSED(event)) { }

 
 

+#if wxUSE_MENUS

     // send wxUpdateUIEvents for all menu items (called from OnIdle())
     void DoMenuUpdates();
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
     // send wxUpdateUIEvents for all menu items (called from OnIdle())
     void DoMenuUpdates();
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);

+#endif // wxUSE_MENUS
+
+    // 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

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


@@ -176,13 +159,33 @@ protected:
     // main menubar, statusbar and toolbar (if any)
     void DeleteAllBars();
 
     // main menubar, statusbar and toolbar (if any)
     void DeleteAllBars();
 

+    // test whether this window makes part of the frame
+    virtual bool IsOneOfBars(const wxWindow *win) const;
+
+#if wxUSE_MENUS
+    // override to update menu bar position when the frame size changes
+    virtual void PositionMenuBar() { }
+
+    // override to do something special when the menu bar is being removed
+    // from the frame
+    virtual void DetachMenuBar();
+
+    // override to do something special when the menu bar is attached to the
+    // frame
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+

     wxMenuBar *m_frameMenuBar;
     wxMenuBar *m_frameMenuBar;

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     // override to update status bar position (or anything else) when
     // something changes
     virtual void PositionStatusBar() { }
 
 
 #if wxUSE_STATUSBAR
     // override to update status bar position (or anything else) when
     // something changes
     virtual void PositionStatusBar() { }
 

+    // show the help string for this menu item in the given status bar: the
+    // status bar pointer can be NULL; return TRUE if help was shown
+    bool ShowMenuHelp(wxStatusBar *statbar, int id);
+

     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 


@@ -194,32 +197,24 @@ protected:
     wxToolBar *m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 
     wxToolBar *m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 

-    // the frame client to screen translation should take account of the
-    // toolbar which may shift the origin of the client area
-    virtual void DoClientToScreen(int *x, int *y) const;
-    virtual void DoScreenToClient(int *x, int *y) const;
-
-    // the frame icon
-    wxIcon m_icon;
-

     DECLARE_EVENT_TABLE()
 };
 
 // include the real class declaration
     DECLARE_EVENT_TABLE()
 };
 
 // include the real class declaration

-#if defined(__WXMSW__)
-    #include "wx/msw/frame.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/frame.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/frame.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/frame.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/frame.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/frame.h"
+#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
+    #include "wx/univ/frame.h"
+#else // !__WXUNIVERSAL__
+    #if defined(__WXMSW__)
+        #include "wx/msw/frame.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk/frame.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/frame.h"
+    #elif defined(__WXMAC__)
+        #include "wx/mac/frame.h"
+    #elif defined(__WXPM__)
+        #include "wx/os2/frame.h"
+    #endif

 #endif
 
 #endif
 #endif
 
 #endif