X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d45127a543b01fe66a5d94033f6730e057a78a9a..c1aec196fc3e544d0188cfc975344887eeb10e0f:/src/mac/carbon/popupwin.cpp

diff --git a/src/mac/carbon/popupwin.cpp b/src/mac/carbon/popupwin.cpp
index bd4fe547fa..c2ecd3cf59 100644
--- a/src/mac/carbon/popupwin.cpp
+++ b/src/mac/carbon/popupwin.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
-// CAUTION : This is not functional yet
+// CAUTION : This is only experimental stuff right now
 
 // ----------------------------------------------------------------------------
 // headers
@@ -32,6 +32,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/popupwin.h"
+#include "wx/tooltip.h"
 
 #include "wx/mac/private.h"    
 
@@ -39,79 +40,20 @@
 // implementation
 // ============================================================================
 
+wxPopupWindow::~wxPopupWindow()
+{
+}
+
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
     // popup windows are created hidden by default
     Hide();
 
     return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, wxID_ANY,
+               wxNonOwnedWindow::Create(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
-}
-
-void wxPopupWindow::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);
-}
-
-/*
-WXDWORD wxPopupWindow::MSWGetStyle(long flags, WXDWORD *exstyle) const
-{
-    // we only honour the border flags, the others don't make sense for us
-    WXDWORD style = wxWindow::MSWGetStyle(flags & wxBORDER_MASK, exstyle);
-
-    if ( exstyle )
-    {
-        // a popup window floats on top of everything
-        *exstyle |= WS_EX_TOPMOST | WS_EX_TOOLWINDOW;
-    }
-
-    return style;
-}
-
-WXHWND wxPopupWindow::MSWGetParent() const
-{
-    // we must be a child of the desktop to be able to extend beyond the parent
-    // window client area (like the comboboxes drop downs do)
-    //
-    // NB: alternative implementation would be to use WS_POPUP instead of
-    //     WS_CHILD but then showing a popup would deactivate the parent which
-    //     is ugly and working around this, although possible, is even more
-    //     ugly
-    // GetDesktopWindow() is not always supported on WinCE, and if
-    // it is, it often returns NULL.
-#ifdef __WXWINCE__
-    return 0;
-#else
-    return (WXHWND)::GetDesktopWindow();
-#endif
-}
-*/
-
-bool wxPopupWindow::Show(bool show)
-{
-    if ( !wxWindowMac::Show(show) )
-        return false;
-/*
-    if ( show )
-    {
-        // raise to top of z order
-        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
-        {
-            wxLogLastError(_T("SetWindowPos"));
-        }
 
-        // and set it as the foreground window so the mouse can be captured
-        ::SetForegroundWindow(GetHwnd());
-    }
-*/
-    return true;
 }
 
 #endif // #if wxUSE_POPUPWIN