Compilation fix

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

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

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "popupwinbase.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_POPUPWIN

 
 #include "wx/window.h"
 
 
 #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.


@@ -46,20 +45,26 @@ public:
     virtual void Position(const wxPoint& ptOrigin,
                           const wxSize& size);
 
     virtual void Position(const wxPoint& ptOrigin,
                           const wxSize& size);
 

+    virtual bool IsTopLevel() const { return true; }
+

     DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
 };
 
 
 // include the real class declaration
     DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
 };
 
 
 // include the real class declaration

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     #include "wx/msw/popupwin.h"
     #include "wx/msw/popupwin.h"

-#elif __WXPM__
+#elif defined(__WXPM__)

     #include "wx/os2/popupwin.h"
     #include "wx/os2/popupwin.h"

-#elif __WXGTK__
+#elif defined(__WXGTK20__)

     #include "wx/gtk/popupwin.h"
     #include "wx/gtk/popupwin.h"

-#elif __WXX11__
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/popupwin.h"
+#elif defined(__WXX11__)

     #include "wx/x11/popupwin.h"
     #include "wx/x11/popupwin.h"

-#elif __WXMGL__
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/popupwin.h"
+#elif defined(__WXMGL__)

     #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
     #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."


@@ -93,13 +98,16 @@ public:
     //
     // VZ: where is this used??
     virtual bool CanDismiss()
     //
     // VZ: where is this used??
     virtual bool CanDismiss()

-        { return TRUE; }
+        { return true; }

 
 

-    // called when a mouse is pressed while the popup is shown: 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)
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 
     // from here to prevent its normal processing by the popup (which consists
     // in dismissing it if the mouse is cilcked outside it)
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 

+    // Overridden to grab the input on some plaforms
+    virtual bool Show( bool show = true );
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -114,6 +122,14 @@ protected:
     // remove our event handlers
     void PopHandlers();
 
     // remove our event handlers
     void PopHandlers();
 

+    // get alerted when child gets deleted from under us
+    void OnDestroy(wxWindowDestroyEvent& event);
+
+#ifdef __WXMSW__
+    // check if the mouse needs captured or released
+    void OnIdle(wxIdleEvent& event);
+#endif
+

     // the child of this popup if any
     wxWindow *m_child;
 
     // the child of this popup if any
     wxWindow *m_child;
 


@@ -128,6 +144,7 @@ protected:
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 

+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
     DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
     DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };


@@ -171,4 +188,3 @@ protected:
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_

-