finally applied the helpbest patch

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 4c00cc1ed99684412d97ce6e29f466a48fe49c39..bd9524c08f15121b0d8f22f6e721432d89027963 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -13,7 +13,7 @@
 #define _WX_POPUPWIN_H_BASE_
 
 #ifdef __GNUG__
 #define _WX_POPUPWIN_H_BASE_
 
 #ifdef __GNUG__

-    #pragma interface "popupwin.h"
+    #pragma interface "popupwinbase.h"

 #endif
 
 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"


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

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

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


@@ -106,7 +109,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 +136,7 @@ protected:
     wxComboControl *m_combo;
 };
 
     wxComboControl *m_combo;
 };
 

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

 
 #endif // wxUSE_POPUPWIN
 
 
 #endif // wxUSE_POPUPWIN