Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index b5dc463a1e09a651c222084b803dbb7736647e14..84758c1bb8efe5a8f39ddeb4bf8edb2584edd5d4 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -20,9 +20,7 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,
 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,


@@ -216,7 +214,7 @@ void wxChoice::DoSetSize(int x, int y,
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 

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

 {
     // find the widest string
     int wLine;
 {
     // find the widest string
     int wLine;


@@ -237,7 +235,7 @@ wxSize wxChoice::DoGetBestSize()
 
     // the combobox should be larger than the widest string
     int cx, cy;
 
     // the combobox should be larger than the widest string
     int cx, cy;

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

 
     wChoice += 5*cx;
 
 
     wChoice += 5*cx;
 


@@ -248,7 +246,7 @@ wxSize wxChoice::DoGetBestSize()
     return wxSize(wChoice, hChoice);
 }
 
     return wxSize(wChoice, hChoice);
 }
 

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

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


@@ -266,7 +264,7 @@ MRESULT wxChoice::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARA
             return 0;
     }
     */
             return 0;
     }
     */

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

 }
 
 bool wxChoice::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 }
 
 bool wxChoice::OS2Command(WXUINT param, WXWORD WXUNUSED(id))