don't skip the scroll position validity check in CalcScrollInc() if m_[xy]ScrollPixel...

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

diff --git a/src/palmos/combobox.cpp b/src/palmos/combobox.cpp
index 2a0c230f7180d418602a2f7e7cabe5b7d47a72a2..e35fbcf02807bab6c2dd4079d84aed80d3b68fcf 100644 (file)
--- a/src/palmos/combobox.cpp
+++ b/src/palmos/combobox.cpp
@@ -26,22 +26,20 @@
 
 #if wxUSE_COMBOBOX
 
+#include "wx/combobox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/log.h"
     // for wxEVT_COMMAND_TEXT_ENTER
     #include "wx/textctrl.h"
+    #include "wx/brush.h"
 #endif
 
-#include "wx/combobox.h"
-#include "wx/brush.h"
 #include "wx/clipbrd.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_TOOLTIPS
-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
@@ -280,4 +278,3 @@ bool wxComboBox::CanRedo() const
 
 
 #endif // wxUSE_COMBOBOX
-