Updated to version 1.40 of Scintilla

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index fd9afe2a918f0af39c7ddc4fc7268ebc94452e4e..ee6e5c792f430c01a35df73058fcbc973e83d02a 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -20,8 +20,7 @@
     #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;
 
 // the default names for various classs
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;


@@ -33,14 +32,6 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxStatusBar;
 class WXDLLEXPORT wxToolBar;
 

-// Styles for ShowFullScreen
-#define wxFULLSCREEN_NOMENUBAR      0x01
-#define wxFULLSCREEN_NOTOOLBAR      0x02
-#define wxFULLSCREEN_NOSTATUSBAR    0x04
-#define wxFULLSCREEN_NOBORDER       0x08
-#define wxFULLSCREEN_NOCAPTION      0x10
-#define wxFULLSCREEN_ALL            (wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION)
-

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


@@ -53,13 +44,18 @@ 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();

-#ifdef __WXMAC_X__
-    virtual ~wxFrameBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxFrameBase() { }

 #endif
 
     wxFrame *New(wxWindow *parent,
 #endif
 
     wxFrame *New(wxWindow *parent,


@@ -73,30 +69,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;


@@ -105,7 +77,7 @@ public:
     // ------------------
 
 #if wxUSE_MENUS
     // ------------------
 
 #if wxUSE_MENUS

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

     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 


@@ -157,27 +129,12 @@ 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())
 
 #if wxUSE_MENUS
     // send wxUpdateUIEvents for all menu items (called from OnIdle())


@@ -200,6 +157,14 @@ protected:
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar() { }
 
     // 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;
 #endif // wxUSE_MENUS
 
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 


@@ -223,108 +188,54 @@ 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;
-
-    // send the iconize event, return TRUE if processed
-    bool SendIconizeEvent(bool iconized = TRUE);
-
-    // the frame icon
-    wxIcon m_icon;
-

     DECLARE_EVENT_TABLE()
 };
 
 // include the real class declaration
 #if defined(__WXMSW__)
     #include "wx/msw/frame.h"
     DECLARE_EVENT_TABLE()
 };
 
 // include the real class declaration
 #if defined(__WXMSW__)
     #include "wx/msw/frame.h"

-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameMSW
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        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)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
+    #define wxFrameNative wxFrameMSW

 #elif defined(__WXGTK__)
     #include "wx/gtk/frame.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/frame.h"

-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameGTK
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        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)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
-#elif defined(__WXMGL__)
-    #include "wx/mgl/frame.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/frame.h"
+    #define wxFrameNative wxFrameGTK
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/frame.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/frame.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/frame.h"

-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameMac
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        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)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
+    #define wxFrameNative wxFrameMac
+#elif defined(__WXMGL__)
+    #include "wx/mgl/frame.h"
+    #define wxFrameNative wxFrameMGL

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

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/frame.h"
+    #define wxFrameNative wxFrameOS2

 #endif
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/frame.h"
 #endif
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/frame.h"

-#endif
+#else // !__WXUNIVERSAL__
+    #ifdef wxFrameNative
+        class WXDLLEXPORT wxFrame : public wxFrameNative
+        {
+        public:
+            // construction
+            wxFrame() { Init(); }
+            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)
+            {
+                Init();
+                Create(parent, id, title, pos, size, style, name);
+            }
+
+            DECLARE_DYNAMIC_CLASS(wxFrame)
+        };
+    #endif // wxFrameNative
+#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__

 
 #endif
     // _WX_FRAME_H_BASE_
 
 #endif
     // _WX_FRAME_H_BASE_