use ES_RIGHT|ES_NUMBER styles for the buddy control as it's used for numeric entry...

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 2a3f669fe96155038908a60dcfdd335c267b95ec..d3ff05da08fab752c49dda6e1cea85648335d8b3 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/os2/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
@@ -9,19 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/combobox.h"
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
+#include "wx/combobox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_COMBOBOX
-
-#include "wx/combobox.h"
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
@@ -39,41 +37,35 @@ static WXFARPROC gfnWndprocEdit     = (WXFARPROC)NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
-bool wxComboBox::OS2Command(
-  WXUINT                            uParam
-, WXWORD                            WXUNUSED(wId)
-)
+bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {
-    long                            lSel = -1L;
-    wxString                        sValue;
+    long lSel = GetSelection();
+    wxString sValue;
 
     switch (uParam)
     {
         case CBN_LBSELECT:
-            if (GetSelection() > -1)
+            if (lSel > -1)
             {
-                wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
-                                           ,GetId()
-                                          );
+                wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
 
-                vEvent.SetInt(GetSelection());
+                vEvent.SetInt(lSel);
                 vEvent.SetEventObject(this);
-                vEvent.SetString((char*)GetStringSelection().c_str());
+                vEvent.SetString(GetStringSelection());
+
                 ProcessCommand(vEvent);
             }
             break;
 
         case CBN_EFCHANGE:
             {
-                wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
-                                           ,GetId()
-                                          );
+                wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
 
                 if (lSel == -1L)
                     sValue = GetValue();
                 else
-                    SetValue(sValue);
-                vEvent.SetString((char*)GetValue().c_str());
+                    sValue = GetStringSelection();
+                vEvent.SetString(sValue);
                 vEvent.SetEventObject(this);
                 ProcessCommand(vEvent);
             }
@@ -137,8 +129,9 @@ bool wxComboBox::Create(
     lSstyle = WS_TABSTOP   |
               WS_VISIBLE;
 
-    if (lStyle & wxCLIP_SIBLINGS )
-        lSstyle |= WS_CLIPSIBLINGS;
+    // clipping siblings does not yet work
+    // if (lStyle & wxCLIP_SIBLINGS )
+    //     lSstyle |= WS_CLIPSIBLINGS;
     if (lStyle & wxCB_READONLY)
         lSstyle |= CBS_DROPDOWNLIST;
     else if (lStyle & wxCB_SIMPLE)
@@ -147,7 +140,7 @@ bool wxComboBox::Create(
         lSstyle |= CBS_DROPDOWN;
 
 
-    if (!OS2CreateControl( "COMBOBOX"
+    if (!OS2CreateControl( _T("COMBOBOX")
                           ,lSstyle
                          ))
         return false;
@@ -158,10 +151,7 @@ bool wxComboBox::Create(
     //
     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]);
     }
@@ -171,6 +161,14 @@ bool wxComboBox::Create(
             ,rSize.x
             ,rSize.y
            );
+
+    // Set height to use with sizers i.e. without the dropdown listbox
+    wxFont vFont = GetFont();
+    int nEditHeight;
+    wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont );
+    nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight);
+    SetInitialSize(wxSize(-1,nEditHeight+4));   // +2x2 for the border
+
     if (!rsValue.empty())
     {
         SetValue(rsValue);
@@ -183,6 +181,11 @@ bool wxComboBox::Create(
     return true;
 } // end of wxComboBox::Create
 
+wxString wxComboBox::GetValue() const
+{
+    return wxGetWindowText(GetHwnd());
+}
+
 void wxComboBox::SetValue(
   const wxString&                   rsValue
 )
@@ -279,11 +282,9 @@ wxTextPos wxComboBox::GetLastPosition() const
     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();
@@ -298,7 +299,7 @@ void wxComboBox::Replace(
     // Now replace with 'value', by pasting.
     //
     wxSetClipboardData( wxDF_TEXT
-                       ,(wxObject *)rsValue.c_str()
+                       ,rsValue.c_str()
                        ,0
                        ,0
                       );
@@ -307,30 +308,31 @@ void wxComboBox::Replace(
     // Paste into edit control
     //
     ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0L);
+#else
+    wxUnusedVar(lFrom);
+    wxUnusedVar(lTo);
+    wxUnusedVar(rsValue);
 #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);
+#else
+    wxUnusedVar(lFrom);
+    wxUnusedVar(lTo);
 #endif
 } // end of wxComboBox::Remove
 
-void wxComboBox::SetSelection(
-  long                              lFrom
-, long                              lTo
-)
+void wxComboBox::SetSelection( long lFrom, long lTo )
 {
-    HWND                            hWnd = GetHwnd();
-    long                            lFromChar = 0;
-    long                            lToChar   = 0;
+    HWND hWnd = GetHwnd();
+    long lFromChar = 0;
+    long lToChar   = 0;
 
     //
     // If from and to are both -1, it means
@@ -350,22 +352,6 @@ void wxComboBox::SetSelection(
                 );
 } // end of wxComboBox::SetSelection
 
-void wxComboBox::DoSetSize(
-  int                               nX
-, int                               nY
-, int                               nWidth
-, int                               nHeight
-, int                               nSizeFlags
-)
-{
-    wxControl::DoSetSize( nX
-                         ,nY
-                         ,nWidth
-                         ,nHeight
-                         ,nSizeFlags
-                        );
-} // end of wxComboBox::DoSetSize
-
 bool wxComboBox::ProcessEditMsg(
   WXUINT                            uMsg
 , WXWPARAM                          wParam
@@ -401,10 +387,9 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleSetFocus((WXHWND)(HWND)wParam));
             else
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
-            break;
     }
     return false;
-} // end of WinGuiBase_CComboBox::ProcessEditMsg
+} // end of wxComboBox::ProcessEditMsg
 
 MRESULT EXPENTRY wxComboEditWndProc(
   HWND                              hWnd
@@ -442,4 +427,3 @@ MRESULT EXPENTRY wxComboEditWndProc(
 
 #endif
  // wxUSE_COMBOBOX
-