Patch [ 688973 ] from William Gallafent: add missing wx/dc.h.

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 927325f75848a6a21c64de43e2064c8f35a9f5e1..90a8241fae21a63ca96348322652e631966e976a 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -49,7 +49,7 @@ bool wxComboBox::OS2Command(
 
     switch (uParam)
     {
 
     switch (uParam)
     {

-        case LN_SELECT:
+        case CBN_LBSELECT:

             if (GetSelection() > -1)
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
             if (GetSelection() > -1)
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED


@@ -63,7 +63,7 @@ bool wxComboBox::OS2Command(
             }
             break;
 
             }
             break;
 

-        case EN_CHANGE:
+        case CBN_EFCHANGE:

             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
                                            ,GetId()
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
                                            ,GetId()


@@ -95,21 +95,18 @@ 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
 )
 {

+    m_isShown = FALSE;

 
     if (!CreateControl( pParent
                        ,vId
                        ,rPos
                        ,rSize
                        ,lStyle
 
     if (!CreateControl( pParent
                        ,vId
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

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


@@ -143,12 +140,7 @@ bool wxComboBox::Create(
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 

-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
+    SetFont(*wxSMALL_FONT);

 
     int                             i;
     for (i = 0; i < n; i++)
 
     int                             i;
     for (i = 0; i < n; i++)


@@ -169,7 +161,7 @@ bool wxComboBox::Create(
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);

-    delete pTextFont;
+    Show(TRUE);

     return TRUE;
 } // end of wxComboBox::Create
 
     return TRUE;
 } // end of wxComboBox::Create
 


@@ -177,37 +169,8 @@ void wxComboBox::SetValue(
   const wxString&                   rsValue
 )
 {
   const wxString&                   rsValue
 )
 {

-    //
-    // If newlines are denoted by just 10, must stick 13 in front.
-    //
-    int                             nSingletons = 0;
-    int                             nLen = rsValue.Length();
-    int                             i;
-
-    for (i = 0; i < nLen; i ++)
-    {
-        if ((i > 0) && (rsValue[i] == 10) && (rsValue[i - 1] != 13))
-            nSingletons ++;
-    }
-    if (nSingletons > 0)
-    {
-        wxChar*                     zTmp = new wxChar[nLen + nSingletons + 1];
-        int                         j = 0;
-
-        for (i = 0; i < nLen; i ++)
-        {
-            if ((i > 0) && (rsValue[i] == 10) && (rsValue[i - 1] != 13))
-            {
-                zTmp[j] = 13;
-                j++;
-            }
-            zTmp[j] = rsValue[i];
-            j++;
-        }
-        zTmp[j] = 0;
-        ::WinSetWindowText(GetHwnd(), zTmp);
-        delete[] zTmp;
-    }
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(rsValue);

     else
         ::WinSetWindowText(GetHwnd(), rsValue.c_str());
 } // end of wxComboBox::SetValue
     else
         ::WinSetWindowText(GetHwnd(), rsValue.c_str());
 } // end of wxComboBox::SetValue