add parentheses for && inside || to fix g++ 4.3 warning

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index ec2bd57eef8777c8aab1a162133f686afac81189..8ae9f4d7ab86a0f47a8d5dbadc3a5b64b8aa787c 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
@@ -62,9 +62,7 @@ bool wxStaticBox::Create( wxWindow*       pParent,
     //
     SetBackgroundColour(GetParent()->GetBackgroundColour());
 
-    wxColour                        vColour;
-    vColour.Set(wxString(wxT("BLACK")));
-    LONG                            lColor = (LONG)vColour.GetPixel();
+    LONG lColor = (LONG)wxBLACK->GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)