Include wx/combobox.h according to precompiled headers of wx/wx.h (with other minor...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index 406bce80e443fb7d8ad97af280c39699782e6ab6..822194e427d4d995cc30158e5e1b3092e2144eb9 100644 (file)
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -78,6 +78,8 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

+#include "wx/combobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/log.h"


@@ -85,7 +87,6 @@
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"

-#include "wx/combobox.h"

 
 #import <AppKit/NSComboBox.h>
 #import <Foundation/NSNotification.h>
 
 #import <AppKit/NSComboBox.h>
 #import <Foundation/NSNotification.h>


@@ -160,8 +161,6 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 
 @end // implementation wxPoserNSComboBox
 
 
 @end // implementation wxPoserNSComboBox
 

-#include "wx/combobox.h"
-

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index bca191234fdeedbe60c2bb0eb40e67db91198653..36a3bbe91acd90c38212717fee75c29be7e72501 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -25,9 +25,10 @@
 
 #if wxUSE_COMBOCTRL
 
 
 #if wxUSE_COMBOCTRL
 

+#include "wx/combobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/combobox.h"

     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"


@@ -895,7 +896,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
         if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
         {
             int newY = butHeight+(customBorder*2);
         if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
         {
             int newY = butHeight+(customBorder*2);

-            SetClientSize(-1,newY);
+            SetClientSize(wxDefaultCoord,newY);

             sz.y = newY;
         }
     }
             sz.y = newY;
         }
     }

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index bc774aeddcfc15da0a84a8505cdf8f46cef52d3b..27f4b8f458ad7c2f01c1aed9a6212d7bbcf79c16 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -29,11 +29,11 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"

+    #include "wx/combobox.h"

 #endif
 
 #include "wx/layout.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/module.h"

-#include "wx/combobox.h"

 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index a96be8e042554a3561983d348c8eebf71577e154..02c70feb3c7c53613f4f0583ef0af922b55a3879 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -28,11 +28,11 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"

+    #include "wx/combobox.h"

 #endif
 
 #include "wx/layout.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/module.h"

-#include "wx/combobox.h"

 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 5e86909cb97d724c22f42492c3c5a6008b7267c1..0458be450f93d5002de402218b8f8713aa6f37ba 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -14,11 +14,12 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

+#include "wx/combobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
 #endif
 

-#include "wx/combobox.h"

 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 


@@ -36,35 +37,29 @@ static WXFARPROC gfnWndprocEdit     = (WXFARPROC)NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 
 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)
             {
 
     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());
 
                 vEvent.SetInt(GetSelection());
                 vEvent.SetEventObject(this);
                 vEvent.SetString(GetStringSelection());

+

                 ProcessCommand(vEvent);
             }
             break;
 
         case CBN_EFCHANGE:
             {
                 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();
 
                 if (lSel == -1L)
                     sValue = GetValue();


@@ -319,14 +314,11 @@ void wxComboBox::Remove( long lFrom, long lTo)
 #endif
 } // end of wxComboBox::Remove
 
 #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
 
     //
     // If from and to are both -1, it means

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index c7a2e255eb3b7379041ced1fb8bafc12cc42aa10..f8d20a69009b9ec488b9c64128ccbbf94e50ab80 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -21,14 +21,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/combobox.h"

 #endif
 
 #endif
 

-#include "wx/combobox.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()

-: wxXmlResourceHandler() , m_insideBox(false)
+                     :wxXmlResourceHandler()
+                     ,m_insideBox(false)

 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);
 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);