fixed broken wxCtime() implementation (wrong buffer size count, wrong conversion)

[wxWidgets.git] / src / msw / popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index a9c0676ae3968e9e4cc4ce54f0b770bbf076def1..78a9a676bf084e69c0ac7e868c4e87bc70283879 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "popup.h"
 #endif
 
     #pragma implementation "popup.h"
 #endif
 


@@ -29,22 +29,26 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/defs.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#if wxUSE_POPUPWIN
+

 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 
 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 

-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {

+    // popup windows are created hidden by default
+    Hide();
+

     return wxPopupWindowBase::Create(parent) &&
     return wxPopupWindowBase::Create(parent) &&

-               wxWindow::Create(parent, -1,
+               wxWindow::Create(parent, wxID_ANY,

                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }


@@ -82,6 +86,31 @@ WXHWND wxPopupWindow::MSWGetParent() const
     //     WS_CHILD but then showing a popup would deactivate the parent which
     //     is ugly and working around this, although possible, is even more
     //     ugly
     //     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();
     return (WXHWND)::GetDesktopWindow();

+#endif
+}
+
+bool wxPopupWindow::Show(bool show)
+{
+    if ( !wxWindowMSW::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"));
+        }
+    }
+
+    return true;

 }
 
 }
 

+#endif // #if wxUSE_POPUPWIN
+