support metal appearance

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 867815ccdfb6d78b0c08f23151d742458d75c1a6..c8e5138c7b4a02517fe88e7bb2986529a4fc1595 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -86,6 +86,24 @@ bool wxComboBox::OS2Command(
     return FALSE;
 } // end of wxComboBox::OS2Command
 
     return FALSE;
 } // end of wxComboBox::OS2Command
 

+bool wxComboBox::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxString&                   rsValue
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, const wxArrayString&              asChoices
+, long                              lStyle
+, const wxValidator&                rValidator
+, const wxString&                   rsName
+)
+{
+    wxCArrayString chs(asChoices);
+
+    return Create(pParent, vId, rsValue, rPos, rSize, chs.GetCount(),
+                  chs.GetStrings(), lStyle, rValidator, rsName);
+}
+

 bool wxComboBox::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 bool wxComboBox::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId


@@ -95,9 +113,7 @@ bool wxComboBox::Create(
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -108,9 +124,7 @@ bool wxComboBox::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;


@@ -242,7 +256,6 @@ long wxComboBox::GetInsertionPoint() const
 
 long wxComboBox::GetLastPosition() const
 {
 
 long wxComboBox::GetLastPosition() const
 {

-    HWND                            hEditWnd = GetHwnd();

     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
 
     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
 


@@ -274,8 +287,6 @@ void wxComboBox::Replace(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;

 
     //
     // Set selection and remove it
 
     //
     // Set selection and remove it


@@ -306,8 +317,6 @@ void wxComboBox::Remove(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;

 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);
 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);


@@ -320,8 +329,8 @@ void wxComboBox::SetSelection(
 )
 {
     HWND                            hWnd = GetHwnd();
 )
 {
     HWND                            hWnd = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;
+    long                            lFromChar = 0;
+    long                            lToChar   = 0;

 
     //
     // If from and to are both -1, it means
 
     //
     // If from and to are both -1, it means