Applied pop menu patch.

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 3b33682aa693c1965588b690abaa288ab2fd78c1..40bb3a49d6f925e68491fcb548007a23bae5a4c4 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -14,14 +14,14 @@
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 

+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "toplevelbase.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma interface "toplevelbase.h"
-#endif
-

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


@@ -108,6 +108,11 @@ public:
     virtual wxString GetTitle() const = 0;
      */
 
     virtual wxString GetTitle() const = 0;
      */
 

+    // Set the shape of the window to the given region.
+    // Returns TRUE if the platform supports this feature (and the
+    // operation is successful.)
+    virtual bool SetShape(const wxRegion& WXUNUSED(region)) { return FALSE; }
+

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


@@ -129,6 +134,9 @@ public:
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 

+    // do the window-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
+

 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area


@@ -150,6 +158,7 @@ protected:
     // the frame icon
     wxIconBundle m_icons;
 
     // the frame icon
     wxIconBundle m_icons;
 

+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -170,9 +179,15 @@ protected:
 #elif defined(__WXMAC__)
     #include "wx/mac/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
 #elif defined(__WXMAC__)
     #include "wx/mac/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowCocoa

 #elif defined(__WXPM__)
     #include "wx/os2/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowOS2
 #elif defined(__WXPM__)
     #include "wx/os2/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowOS2

+#elif defined(__WXMOTIF__)
+    #include "wx/motif/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMotif

 #endif
 
 #ifdef __WXUNIVERSAL__
 #endif
 
 #ifdef __WXUNIVERSAL__


@@ -185,7 +200,7 @@ protected:
             // construction
             wxTopLevelWindow() { Init(); }
             wxTopLevelWindow(wxWindow *parent,
             // construction
             wxTopLevelWindow() { Init(); }
             wxTopLevelWindow(wxWindow *parent,

-                       wxWindowID id,
+                       wxWindowID winid,

                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,


@@ -193,15 +208,13 @@ protected:
                        const wxString& name = wxFrameNameStr)
             {
                 Init();
                        const wxString& name = wxFrameNameStr)
             {
                 Init();

-                Create(parent, id, title, pos, size, style, name);
+                Create(parent, winid, title, pos, size, style, name);

             }
 
             }
 

-            DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
+            DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)

         };
     #endif // wxTopLevelWindowNative
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
 
 #endif // _WX_TOPLEVEL_BASE_H_
         };
     #endif // wxTopLevelWindowNative
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
 
 #endif // _WX_TOPLEVEL_BASE_H_

-
-// vi:sts=4:sw=4:et