don't redeclare vsscanf() for Windows compilers, the case of missing declaration...

[wxWidgets.git] / include / wx / mac / carbon / popupwin.h

diff --git a/include/wx/mac/carbon/popupwin.h b/include/wx/mac/carbon/popupwin.h
index c1590abc73619ee25e90086413072a2d790488f2..3bf458ef156f78451a793614d1cbc5bc8f8b5973 100644 (file)
--- a/include/wx/mac/carbon/popupwin.h
+++ b/include/wx/mac/carbon/popupwin.h
@@ -16,7 +16,7 @@
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 

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

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


@@ -27,19 +27,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

-    virtual bool Show(bool show = true);
-
-    WXWindow MacGetPopupWindowRef() const ;
-

 protected:
 protected:

-    // popups handle the position like wxTopLevelWindow, not wxWindow
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    
-    WXWindow m_popupWindowRef ;
-

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };