Better sorting example and better default

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 0458be450f93d5002de402218b8f8713aa6f37ba..d3ff05da08fab752c49dda6e1cea85648335d8b3 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -39,17 +39,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {
 
 bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {

-    long lSel = -1L;
+    long lSel = GetSelection();

     wxString sValue;
 
     switch (uParam)
     {
         case CBN_LBSELECT:
     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(GetStringSelection());
 
                 vEvent.SetEventObject(this);
                 vEvent.SetString(GetStringSelection());
 


@@ -64,8 +64,8 @@ bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
                 if (lSel == -1L)
                     sValue = GetValue();
                 else
                 if (lSel == -1L)
                     sValue = GetValue();
                 else

-                    SetValue(sValue);
-                vEvent.SetString(GetValue());
+                    sValue = GetStringSelection();
+                vEvent.SetString(sValue);

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


@@ -129,8 +129,9 @@ bool wxComboBox::Create(
     lSstyle = WS_TABSTOP   |
               WS_VISIBLE;
 
     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)
     if (lStyle & wxCB_READONLY)
         lSstyle |= CBS_DROPDOWNLIST;
     else if (lStyle & wxCB_SIMPLE)


@@ -160,6 +161,14 @@ bool wxComboBox::Create(
             ,rSize.x
             ,rSize.y
            );
             ,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);
     if (!rsValue.empty())
     {
         SetValue(rsValue);


@@ -172,6 +181,11 @@ bool wxComboBox::Create(
     return true;
 } // end of wxComboBox::Create
 
     return true;
 } // end of wxComboBox::Create
 

+wxString wxComboBox::GetValue() const
+{
+    return wxGetWindowText(GetHwnd());
+}
+

 void wxComboBox::SetValue(
   const wxString&                   rsValue
 )
 void wxComboBox::SetValue(
   const wxString&                   rsValue
 )


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

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

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


@@ -285,7 +299,7 @@ void wxComboBox::Replace( long lFrom,
     // Now replace with 'value', by pasting.
     //
     wxSetClipboardData( wxDF_TEXT
     // Now replace with 'value', by pasting.
     //
     wxSetClipboardData( wxDF_TEXT

-                       ,(wxObject *)rsValue.c_str()
+                       ,rsValue.c_str()

                        ,0
                        ,0
                       );
                        ,0
                        ,0
                       );


@@ -338,22 +352,6 @@ void wxComboBox::SetSelection( long lFrom, long lTo )
                 );
 } // end of 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
 bool wxComboBox::ProcessEditMsg(
   WXUINT                            uMsg
 , WXWPARAM                          wParam


@@ -391,7 +389,7 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
     }
     return false;
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
     }
     return false;

-} // end of WinGuiBase_CComboBox::ProcessEditMsg
+} // end of wxComboBox::ProcessEditMsg

 
 MRESULT EXPENTRY wxComboEditWndProc(
   HWND                              hWnd
 
 MRESULT EXPENTRY wxComboEditWndProc(
   HWND                              hWnd