Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp
index 359210196040f39111171704b3f7078a3f3df625..c222600c091f134baba04a15a87ecf4d308e8b36 100644 (file)
--- a/src/os2/popupwin.cpp
+++ b/src/os2/popupwin.cpp
@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        os2/popupwin.cpp
+// Name:        src/os2/popupwin.cpp
 // Purpose:     implements wxPopupWindow for OS2
 // Author:      Dave Webster
 // Modified by:
 // Created:     13.05.02
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 Dave Webster <dwebster@bhmi.com>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "popup.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,16 +23,15 @@
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 
+#if wxUSE_POPUPWIN
 #include "wx/popupwin.h"
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-bool wxPopupWindow::Create(
-  wxWindow*                         pParent
-, int                               nFlags
-)
+bool wxPopupWindow::Create( wxWindow* pParent,
+                            int nFlags )
 {
     return wxPopupWindowBase::Create(pParent) &&
                     wxWindow::Create( pParent
@@ -48,10 +42,8 @@ bool wxPopupWindow::Create(
                                     );
 } // end of wxPopupWindow::Create
 
-void wxPopupWindow::DoGetPosition(
-  int*                              pnX
-, int*                              pnY
-) const
+void wxPopupWindow::DoGetPosition( int* pnX,
+                                   int* pnY ) const
 {
     //
     // The position of a "top level" window such as this should be in
@@ -70,16 +62,13 @@ WXHWND wxPopupWindow::OS2GetParent() const
     return (WXHWND)HWND_DESKTOP;
 } // end of wxPopupWindow::OS2GetParent
 
-WXDWORD wxPopupWindow::OS2GetStyle(
-  long                              lFlags
-, WXDWORD*                          dwExstyle
-) const
+WXDWORD wxPopupWindow::OS2GetStyle( long lFlags,
+                                    WXDWORD* dwExstyle ) const
 {
-    WXDWORD                         dwStyle = wxWindow::OS2GetStyle( lFlags & wxBORDER_MASK
-                                                                    ,dwExstyle
-                                                                   );
+    WXDWORD dwStyle = wxWindow::OS2GetStyle( lFlags & wxBORDER_MASK
+                                             ,dwExstyle
+                                           );
 
     return dwStyle;
 } // end of wxPopupWindow::OS2GetStyle
-
-
+#endif