X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eddf46fea787f245c2b92a02f9777c597e1d9687..b1f68ca3455436222b8704dccdecdb06087c4e7f:/include/wx/popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 010481ec0c..a0bca8f512 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -6,13 +6,13 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "popupwinbase.h"
 #endif
 
@@ -68,6 +68,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
+class WXDLLEXPORT wxPopupWindowHandler;
+class WXDLLEXPORT wxPopupFocusHandler;
+
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:
@@ -84,6 +87,12 @@ public:
     // hide the window
     virtual void Dismiss();
 
+    // can the window be dismissed now?
+    //
+    // VZ: where is this used??
+    virtual bool CanDismiss()
+        { return TRUE; }
+
     // called when a mouse is pressed while the popup is shown: return TRUE
     // from here to prevent its normal processing by the popup (which consists
     // in dismissing it if the mouse is cilcked outside it)
@@ -118,6 +127,7 @@ protected:
     wxPopupFocusHandler  *m_handlerFocus;
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
+    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -144,9 +154,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)
 };