IS_HATCH macro replaced with wxBrush::IsHatch() + source and docs little cleaning.

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 297c0e799164644f52938dac8bfe0232e5e307d9..53d6e0e37df51b7ab9e9078250cd74dff9fc9950 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,6 +12,10 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 

+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "popup.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------


@@ -24,24 +28,21 @@ public:
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 

-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
-    {
-        return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
-                                wxDefaultPosition, wxDefaultSize,
-                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
-    }
+    bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
+
+    virtual bool Show(bool show = true);

 
 protected:
 
 protected:

-    virtual void DoGetPosition(int *x, int *y) const
-    {
-        // the position of a "top level" window such as this should be in
-        // screen coordinates, not in the client ones which MSW gives us
-        // (because we are a child window)
-        wxPopupWindowBase::DoGetPosition(x, y);
-
-        GetParent()->ClientToScreen(x, y);
-    }
+    // popups handle the position like wxTopLevelWindow, not wxWindow
+    virtual void DoGetPosition(int *x, int *y) const;
+
+    // return the style to be used for the popup windows
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
+
+    // get the HWND to be used as parent of this window with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)

 };
 
 #endif // _WX_MSW_POPUPWIN_H_
 };
 
 #endif // _WX_MSW_POPUPWIN_H_