added native wxMessageDialog implementation for GTK+2

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 010481ec0cacc08a63ca2b1e4797cebf6e0a769a..6bee065b9ea34b2d871b5a13ae2872b8a70d7508 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
 


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


@@ -118,6 +127,7 @@ protected:
     wxPopupFocusHandler  *m_handlerFocus;
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
     wxPopupFocusHandler  *m_handlerFocus;
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)

+    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)

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


@@ -144,9 +154,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)
 };