Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index c88b00c999ea4df6364c76c690fc7a535cc074c2..3f1bd033fbb70b038ac05d3e946f26826044a777 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -22,19 +22,17 @@
 
 #include "wx/statbox.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
     EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
-#endif
 
 /*
  * Group box
  */
- 
+
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
@@ -93,10 +91,10 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   return FALSE;
 }
 
-wxSize wxStaticBox::DoGetBestSize()
+wxSize wxStaticBox::DoGetBestSize() const
 {
     int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());
 
     int wBox;
     GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);
@@ -178,6 +176,8 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
 
 MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
+    // TODO:
+/*
     if ( nMsg == WM_NCHITTEST)
     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
@@ -190,6 +190,7 @@ MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLP
         if (yPos < 10)
             return (long)HTCLIENT;
     }
+*/
 
     return wxControl::OS2WindowProc(hwnd, nMsg, wParam, lParam);
 }