corrected after wxUniv merge

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 97f0152e573e5b04bd870997409c6712ad20ef8d..85270d2462415cac72915615d9d3f10eac27a9e0 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -22,14 +22,12 @@
 
 #include "wx/statbox.h"
 
 
 #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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
     EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 

-#endif

 
 /*
  * Group box
 
 /*
  * Group box


@@ -93,10 +91,10 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   return FALSE;
 }
 
   return FALSE;
 }
 

-wxSize wxStaticBox::DoGetBestSize()
+wxSize wxStaticBox::DoGetBestSize() const

 {
     int cx, cy;
 {
     int cx, cy;

-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());

 
     int wBox;
     GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);
 
     int wBox;
     GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);


@@ -176,7 +174,7 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
 */
 }
 
 */
 }
 

-MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+MRESULT wxStaticBox::OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     // TODO:
 /*
 {
     // TODO:
 /*


@@ -194,7 +192,7 @@ MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLP
     }
 */
 
     }
 */
 

-    return wxControl::OS2WindowProc(hwnd, nMsg, wParam, lParam);
+    return wxControl::OS2WindowProc(nMsg, wParam, lParam);

 }
 
 
 }