compilation fixes (I wonder how did you people ever compile it...)

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 9774f8e23b247d44b7d5c0b7e43a2a2137db6af0..accdde8d5d9610b81fe83a78497d7df3574d4849 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -19,7 +19,6 @@
 #include "wx/window.h"
 
 #if wxUSE_POPUPWIN
 #include "wx/window.h"
 
 #if wxUSE_POPUPWIN

-

 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.


@@ -29,6 +28,9 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
 {
 public:
     wxPopupWindowBase() { }

+#ifdef __DARWIN__
+    virtual ~wxPopupWindowBase() { }
+#endif

 
     // create the popup window
     //
 
     // create the popup window
     //


@@ -47,11 +49,16 @@ public:
                           const wxSize& size);
 };
 
                           const wxSize& size);
 };
 

+

 // include the real class declaration
 #ifdef __WXMSW__
     #include "wx/msw/popupwin.h"
 // include the real class declaration
 #ifdef __WXMSW__
     #include "wx/msw/popupwin.h"

+#elif __WXPM__
+    #include "wx/os2/popupwin.h"

 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"

+#elif __WXMGL__
+    #include "wx/mgl/popupwin.h"

 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif


@@ -66,7 +73,7 @@ class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 public:
     // ctors
     wxPopupTransientWindow() { Init(); }
 public:
     // ctors
     wxPopupTransientWindow() { Init(); }

-    wxPopupTransientWindow(wxWindow *parent);
+    wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);

 
     virtual ~wxPopupTransientWindow();
 
 
     virtual ~wxPopupTransientWindow();
 


@@ -106,7 +113,7 @@ protected:
     friend class wxPopupFocusHandler;
 };
 
     friend class wxPopupFocusHandler;
 };
 

-#if wxUSE_COMBOBOX
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox


@@ -133,7 +140,7 @@ protected:
     wxComboControl *m_combo;
 };
 
     wxComboControl *m_combo;
 };
 

-#endif // wxUSE_COMBOBOX
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

 
 #endif // wxUSE_POPUPWIN
 
 
 #endif // wxUSE_POPUPWIN