Rebake after last change.

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 2e50ef613b5f3577cb18359f9a3f6bd2f4ab9d3b..0a1f487b501c7a13d75e902c0a723febde432e48 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -6,21 +6,17 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popup.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase

 {
 public:
     wxPopupWindow() { }
 {
 public:
     wxPopupWindow() { }


@@ -30,11 +26,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
 
     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;
 
     // 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;
 
     // 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)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };