wxID_PREFERENCES added for the preferences menu item

[wxWidgets.git] / include / wx / msw / popupwin.h

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 1dffaa67ee8d2d433306cade0f181ab8f122a8a2..3a1f9f1732dd17adec7d35260b4fb7bed6995dbb 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "popup.h"
 #endif
 
     #pragma interface "popup.h"
 #endif
 


@@ -42,7 +42,7 @@ protected:
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 

-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)

 };
 
 #endif // _WX_MSW_POPUPWIN_H_
 };
 
 #endif // _WX_MSW_POPUPWIN_H_