Don't link with media lib with USE_MEDIA==0.

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 2a3f669fe96155038908a60dcfdd335c267b95ec..c97801ef8573dbcbef6728f6bda1dadb666a4072 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -9,13 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/combobox.h"
-

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

-    #include "wx/setup.h"
+    #include "wx/defs.h"

     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 


@@ -58,7 +56,7 @@ bool wxComboBox::OS2Command(
 
                 vEvent.SetInt(GetSelection());
                 vEvent.SetEventObject(this);
 
                 vEvent.SetInt(GetSelection());
                 vEvent.SetEventObject(this);

-                vEvent.SetString((char*)GetStringSelection().c_str());
+                vEvent.SetString(GetStringSelection());

                 ProcessCommand(vEvent);
             }
             break;
                 ProcessCommand(vEvent);
             }
             break;


@@ -73,7 +71,7 @@ bool wxComboBox::OS2Command(
                     sValue = GetValue();
                 else
                     SetValue(sValue);
                     sValue = GetValue();
                 else
                     SetValue(sValue);

-                vEvent.SetString((char*)GetValue().c_str());
+                vEvent.SetString(GetValue());

                 vEvent.SetEventObject(this);
                 ProcessCommand(vEvent);
             }
                 vEvent.SetEventObject(this);
                 ProcessCommand(vEvent);
             }


@@ -147,7 +145,7 @@ bool wxComboBox::Create(
         lSstyle |= CBS_DROPDOWN;
 
 
         lSstyle |= CBS_DROPDOWN;
 
 

-    if (!OS2CreateControl( "COMBOBOX"
+    if (!OS2CreateControl( _T("COMBOBOX")

                           ,lSstyle
                          ))
         return false;
                           ,lSstyle
                          ))
         return false;


@@ -158,10 +156,7 @@ bool wxComboBox::Create(
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 

-    SetFont(*wxSMALL_FONT);
-
-    int                             i;
-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)

     {
         Append(asChoices[i]);
     }
     {
         Append(asChoices[i]);
     }


@@ -190,7 +185,7 @@ void wxComboBox::SetValue(
     if ( HasFlag(wxCB_READONLY) )
         SetStringSelection(rsValue);
     else
     if ( HasFlag(wxCB_READONLY) )
         SetStringSelection(rsValue);
     else

-        ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+        ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());

 } // end of wxComboBox::SetValue
 
 //
 } // end of wxComboBox::SetValue
 
 //


@@ -279,11 +274,9 @@ wxTextPos wxComboBox::GetLastPosition() const
     return lLineLength;
 } // end of wxComboBox::GetLastPosition
 
     return lLineLength;
 } // end of wxComboBox::GetLastPosition
 

-void wxComboBox::Replace(
-  long                              lFrom
-, long                              lTo
-, const wxString&                   rsValue
-)
+void wxComboBox::Replace( long lFrom,
+                          long lTo,
+                          const wxString& rsValue )

 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();


@@ -307,19 +300,23 @@ void wxComboBox::Replace(
     // Paste into edit control
     //
     ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0L);
     // Paste into edit control
     //
     ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0L);

+#else
+    wxUnusedVar(lFrom);
+    wxUnusedVar(lTo);
+    wxUnusedVar(rsValue);

 #endif
 } // end of wxComboBox::Replace
 
 #endif
 } // end of wxComboBox::Replace
 

-void wxComboBox::Remove(
-  long                              lFrom
-, long                              lTo
-)
+void wxComboBox::Remove( long lFrom, long lTo)

 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);

+#else
+    wxUnusedVar(lFrom);
+    wxUnusedVar(lTo);

 #endif
 } // end of wxComboBox::Remove
 
 #endif
 } // end of wxComboBox::Remove
 


@@ -401,7 +398,6 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleSetFocus((WXHWND)(HWND)wParam));
             else
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
                 return(HandleSetFocus((WXHWND)(HWND)wParam));
             else
                 return(HandleKillFocus((WXHWND)(HWND)wParam));

-            break;

     }
     return false;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg
     }
     return false;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg


@@ -442,4 +438,3 @@ MRESULT EXPENTRY wxComboEditWndProc(
 
 #endif
  // wxUSE_COMBOBOX
 
 #endif
  // wxUSE_COMBOBOX

-