check if we are using compatible C++ ABI when usin GCC or IntelC++

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 10231a6c00d836eab1e7afa9389b35df61ce0252..db7ce019671b32e399ed713429d5725ab9b6f92d 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -14,7 +14,7 @@
 #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__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevelbase.h"
 #endif
 
     #pragma interface "toplevelbase.h"
 #endif
 


@@ -111,7 +111,7 @@ public:
     // Set the shape of the window to the given region.
     // Returns TRUE if the platform supports this feature (and the
     // operation is successful.)
     // 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& region) { return FALSE; }
+    virtual bool SetShape(const wxRegion& WXUNUSED(region)) { return FALSE; }

 
     // old functions, use the new ones instead!
 #if WXWIN_COMPATIBILITY_2
 
     // old functions, use the new ones instead!
 #if WXWIN_COMPATIBILITY_2


@@ -134,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


@@ -155,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()
 };
 


@@ -207,12 +211,10 @@ protected:
                 Create(parent, winid, 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