always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc...

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 896e6f18f59f25c0cf2e2b27921542b30af29dd2..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_
 
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "popupwinbase.h"
 #endif
 
     #pragma interface "popupwinbase.h"
 #endif
 


@@ -28,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
     //


@@ -57,6 +55,8 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
     #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
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
 #else


@@ -68,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:


@@ -84,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)


@@ -109,9 +118,14 @@ 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
 };
 


@@ -127,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);


@@ -138,9 +153,13 @@ 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };