restored variabes initialization in OnButtonSet() to avoid spurious MSVC warnings

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

diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp
index 359210196040f39111171704b3f7078a3f3df625..346d6c87d4009fc11e6a24bca51c72584cfc46f5 100644 (file)
--- a/src/os2/popupwin.cpp
+++ b/src/os2/popupwin.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "popup.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,16 +24,15 @@
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 

+#if wxUSE_POPUPWIN

 #include "wx/popupwin.h"
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #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
 {
     return wxPopupWindowBase::Create(pParent) &&
                     wxWindow::Create( pParent


@@ -48,10 +43,8 @@ bool wxPopupWindow::Create(
                                     );
 } // end of 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
 {
     //
     // The position of a "top level" window such as this should be in


@@ -70,16 +63,13 @@ WXHWND wxPopupWindow::OS2GetParent() const
     return (WXHWND)HWND_DESKTOP;
 } // end of wxPopupWindow::OS2GetParent
 
     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
 
     return dwStyle;
 } // end of wxPopupWindow::OS2GetStyle

-
-
+#endif