Added (and documented) GetTraceMasks so userspace can probe the currently

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index f4c0521e4942ccbcba5721690399f3383f1b9aaf..185d8c7f6573f1566240bf0b0fc1c45be6c6df77 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -12,14 +12,13 @@
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 

-#ifdef __GNUG__
-    #pragma interface "popupwin.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "popupwinbase.h"

 #endif
 
 #include "wx/window.h"
 
 #if wxUSE_POPUPWIN
 #endif
 
 #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,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
 {
 public:
     wxPopupWindowBase() { }

+    virtual ~wxPopupWindowBase();

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


@@ -47,9 +47,18 @@ 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 __WXX11__
+    #include "wx/x11/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


@@ -59,12 +68,15 @@ 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:
     // ctors
     wxPopupTransientWindow() { Init(); }
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:
     // ctors
     wxPopupTransientWindow() { Init(); }

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

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


@@ -75,6 +87,12 @@ public:
     // hide the window
     virtual void Dismiss();
 
     // 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)
     // 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)


@@ -100,11 +118,18 @@ 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
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

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


@@ -116,6 +141,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);


@@ -127,11 +153,17 @@ 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
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

 
 #endif // wxUSE_POPUPWIN
 
 
 #endif // wxUSE_POPUPWIN