SourceForge patch #654210 to fix naming/numbering shared libs under OS X

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 0bef727d28b2e6cb0777dee4cd324ac0e568cbcc..185d8c7f6573f1566240bf0b0fc1c45be6c6df77 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "popupwinbase.h"
 #endif
 
@@ -86,8 +86,10 @@ public:
 
     // hide the window
     virtual void Dismiss();
-    
 
+    // can the window be dismissed now?
+    //
+    // VZ: where is this used??
     virtual bool CanDismiss()
         { return TRUE; }
 
@@ -151,9 +153,13 @@ protected:
     // notify the combo here
     virtual void OnDismiss();
 
+    // forward the key presses to the combobox
+    void OnKeyDown(wxKeyEvent& event);
+
     // the parent combobox
     wxComboControl *m_combo;
 
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };