X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..6c73e20df7f3a7ea8c2059a816ffd3655ea2b848:/src/os2/combobox.cpp

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index ccd8e120d9..0458be450f 100644
--- 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:
@@ -12,14 +12,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
+#include "wx/combobox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_COMBOBOX
-
-#include "wx/combobox.h"
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
@@ -37,35 +37,29 @@ 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 = -1L;
+    wxString sValue;
 
     switch (uParam)
     {
         case CBN_LBSELECT:
             if (GetSelection() > -1)
             {
-                wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
-                                           ,GetId()
-                                          );
+                wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
 
                 vEvent.SetInt(GetSelection());
                 vEvent.SetEventObject(this);
                 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();
@@ -156,10 +150,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]);
     }
@@ -323,14 +314,11 @@ void wxComboBox::Remove( long lFrom, long 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