removed redundant code

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 85ce6295e64d869479692f4204e7af92038702d5..63c4d65eead6c65a56eec2b5d26406ddfb93d469 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,9 +28,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
 {
 public:
     wxPopupWindowBase() { }

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

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


@@ -50,11 +47,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 __WXX11__
+    #include "wx/x11/popupwin.h"

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


@@ -66,6 +68,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
 // 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:
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:


@@ -81,6 +86,10 @@ public:
 
     // hide the window
     virtual void Dismiss();
 
     // hide the window
     virtual void Dismiss();

+    
+
+    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
 
     // 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


@@ -107,8 +116,15 @@ protected:
     // the window which has the focus while we're shown
     wxWindow *m_focus;
 
     // the window which has the focus while we're shown
     wxWindow *m_focus;
 

+    // these classes may call our DismissAndNotify()

     friend class wxPopupWindowHandler;
     friend class wxPopupFocusHandler;
     friend class wxPopupWindowHandler;
     friend class wxPopupFocusHandler;

+
+    // the handlers we created, may be NULL (if not, must be deleted)
+    wxPopupWindowHandler *m_handlerPopup;
+    wxPopupFocusHandler  *m_handlerFocus;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)

 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -123,6 +139,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:

+    wxPopupComboWindow() { m_combo = NULL; }

     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);


@@ -134,8 +151,14 @@ protected:
     // notify the combo here
     virtual void OnDismiss();
 
     // notify the combo here
     virtual void OnDismiss();
 

+    // forward the key presses to the combobox
+    void OnKeyDown(wxKeyEvent& event);
+

     // the parent combobox
     wxComboControl *m_combo;
     // the parent combobox
     wxComboControl *m_combo;

+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)

 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)