avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 3a1f9f1732dd17adec7d35260b4fb7bed6995dbb..69f5ef964106a15a23db7b19e99be9b3ee932008 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popup.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
@@ -30,11 +26,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show(bool show = TRUE);
-
-protected:
-    // popups handle the position like wxTopLevelWindow, not wxWindow
-    virtual void DoGetPosition(int *x, int *y) const;
+    virtual bool Show(bool show = true);
 
     // return the style to be used for the popup windows
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
@@ -42,6 +34,10 @@ protected:
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 
+protected:
+    // popups handle the position like wxTopLevelWindow, not wxWindow
+    virtual void DoGetPosition(int *x, int *y) const;
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };