The use of wxPopupWindow fo rhte autocomplete and calltip windows is

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index ee6e5c792f430c01a35df73058fcbc973e83d02a..0735c82f8ab5e3bcd42c5d933c542e922e43642d 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -54,9 +54,7 @@ class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 public:
     // construction
     wxFrameBase();
 public:
     // construction
     wxFrameBase();

-#ifdef __DARWIN__
-    virtual ~wxFrameBase() { }
-#endif
+    virtual ~wxFrameBase();

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


@@ -110,6 +108,12 @@ public:
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, int number = 0);
     virtual void SetStatusWidths(int n, const int widths_field[]);
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, int number = 0);
     virtual void SetStatusWidths(int n, const int widths_field[]);

+    void PushStatusText(const wxString &text, int number = 0);
+    void PopStatusText(int number = 0);
+
+    // set the status bar pane the help will be shown in
+    void SetStatusBarPane(int n) { m_statusBarPane = n; }
+    int GetStatusBarPane() const { return m_statusBarPane; }

 #endif // wxUSE_STATUSBAR
 
     // toolbar functions
 #endif // wxUSE_STATUSBAR
 
     // toolbar functions


@@ -142,6 +146,21 @@ public:
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 #endif // wxUSE_MENUS
 
     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
+
+    // show help text (typically in the statusbar); show is FALSE
+    // if you are hiding the help, TRUE otherwise
+    virtual void DoGiveHelp(const wxString& text, bool show);
+

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


@@ -180,6 +199,9 @@ protected:
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
 

+
+    int m_statusBarPane;
+

 #if wxUSE_TOOLBAR
     // override to update status bar position (or anything else) when
     // something changes
 #if wxUSE_TOOLBAR
     // override to update status bar position (or anything else) when
     // something changes


@@ -192,50 +214,21 @@ protected:
 };
 
 // include the real class declaration
 };
 
 // include the real class declaration

-#if defined(__WXMSW__)
-    #include "wx/msw/frame.h"
-    #define wxFrameNative wxFrameMSW
-#elif defined(__WXGTK__)
-    #include "wx/gtk/frame.h"
-    #define wxFrameNative wxFrameGTK
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/frame.h"
-    #define wxFrameNative wxFrameMac
-#elif defined(__WXMGL__)
-    #include "wx/mgl/frame.h"
-    #define wxFrameNative wxFrameMGL
-#elif defined(__WXPM__)
-    #include "wx/os2/frame.h"
-    #define wxFrameNative wxFrameOS2
-#endif
-
-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)

     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
     #include "wx/univ/frame.h"
 #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__
+    #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
     // _WX_FRAME_H_BASE_
 
 #endif
     // _WX_FRAME_H_BASE_