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

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

diff --git a/src/cocoa/scrolbar.mm b/src/cocoa/scrolbar.mm
index 9a21343de604a0d89e95c313aa91af979d05152f..81fa2c95fc4b36c1b331f59382416a5a8f4046de 100644 (file)
--- a/src/cocoa/scrolbar.mm
+++ b/src/cocoa/scrolbar.mm
@@ -1,20 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/scrolbar.mm
+// Name:        src/cocoa/scrolbar.mm
 // Purpose:     wxScrollBar
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/25
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #if wxUSE_SCROLLBAR
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/scrolbar.h"
 #endif //WX_PRECOMP
 
 #import <AppKit/NSScroller.h>

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 185f8098d9f3430adf14a3fa374c75e95fda34bb..6869269051d3db5f62967a9e86c50a7eb2f5dbd5 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -28,14 +28,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/window.h"
+    #include "wx/scrolbar.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
 
-#ifdef __WXMAC__
-    #include "wx/scrolbar.h"
-#endif
-
 #ifdef __WXMSW__
     #include "wx/radiobut.h"
 #endif
@@ -646,4 +643,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return false;
 }
-

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index c088059ccf2751602789f5bc456ec5dc0022d761..314d68ea0ebddde40d91b69cb9b1a0a8d5323a49 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -41,11 +41,8 @@
     #include "wx/statusbr.h"
     #include "wx/toolbar.h"
     #include "wx/dcclient.h"
-#endif //WX_PRECOMP
-
-#if defined(__WXMAC__) && wxUSE_SCROLLBAR
     #include "wx/scrolbar.h"
-#endif
+#endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 8d67b5b55fd981ed33174359e1d4e2920bdcad89..ac344ddaa6dcaac562c5cc3800b7a4f30185ec24 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -20,13 +20,13 @@
     #include "wx/dcclient.h"
     #include "wx/button.h"
     #include "wx/dialog.h"
+    #include "wx/scrolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
-#include "wx/scrolbar.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"
 #include "wx/stattext.h"

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 02e3d04beff968e83f91496f2db76d98797f67b7..5f268188b9e3e1e76f676d2aaa81f17098b718bf 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -11,13 +11,14 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index dbf267960f8ad2fbc6b47911c69196e01f2e6e9f..6c8a60d542a5b05adc9db89c7039f7069f0633ca 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -26,10 +26,10 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/scrolbar.h"
 #include "wx/statbox.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
@@ -1762,7 +1762,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 
-    if ( x == -1 && y == -1 )
+    if ( x == wxDefaultCoord && y == wxDefaultCoord )
     {
         wxPoint mouse = wxGetMousePosition();
         x = mouse.x;

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 07c5a659324733245344976bc37630b5523ac0c7..2742383fe20c4b4771bd466cddef47d2cf74e4ba 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -24,13 +24,13 @@
     #include "wx/dcclient.h"
     #include "wx/button.h"
     #include "wx/dialog.h"
+    #include "wx/scrolbar.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
-#include "wx/scrolbar.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"
 #include "wx/stattext.h"

diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp
index fc418208414f71eff03b72bf13182be3bd2b2396..b2a54ee3a39ecd4f0c0af025e1fbddf54d995675 100644 (file)
--- a/src/mac/classic/scrolbar.cpp
+++ b/src/mac/classic/scrolbar.cpp
@@ -15,12 +15,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
-#include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 32504a03ab6764cc6734c4d14bedc18a4d587f08..3393452564881137c60374e341d66deaf55f17ba 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -26,11 +26,11 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
-#include "wx/scrolbar.h"
 #include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index ea7ab3a86967699bff09b0e86a761fcb0ead5257..d892916568a3b49d231859ed6de19114d05e35b3 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -18,12 +18,13 @@
 
 #if wxUSE_SCROLLBAR
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 
 #if wxUSE_EXTENDED_RTTI

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 6b7d26723bb45150045e9f1ef4944cfe365d9a82..2a9a6905775ba474db4ad2ed3e40b55e329697b1 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/slider.cpp
+// Name:        src/msw/slider.cpp
 // Purpose:     wxSlider, using the Win95 (and later) trackbar control
 // Author:      Julian Smart
 // Modified by:
@@ -102,7 +102,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
 
 wxEND_FLAGS( wxSliderStyle )
 
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )

diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp
index 88906bdef78e0db2ece03fbaa4a80de5606d819a..2f8a96dc8222237269958c4ded4a050baa649aa5 100644 (file)
--- a/src/os2/scrolbar.cpp
+++ b/src/os2/scrolbar.cpp
@@ -12,11 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #endif
 
-#include "wx/scrolbar.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)

diff --git a/src/palmos/scrolbar.cpp b/src/palmos/scrolbar.cpp
index 3b3e2d1023816b4bb2ae19c52926d91f2d31b067..2efee6c5dd5e696c483e97f75f68837aefaed5d8 100644 (file)
--- a/src/palmos/scrolbar.cpp
+++ b/src/palmos/scrolbar.cpp
@@ -18,12 +18,13 @@
 
 #if wxUSE_SCROLLBAR
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/scrolbar.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_EXTENDED_RTTI

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 49d00f8beef412779ea31d98a5d847bde39e0863..be30bb7a7c6ae299e47ee74e10f1de9bb5541c4a 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -73,7 +73,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
 
 wxEND_FLAGS( wxSliderStyle )
 
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index f2b103189ca2051dfcf08492a20520efece50e0a..edcaa1015b0a678496787d9ceeb2cc919acf8c44 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -41,12 +41,12 @@
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
 #include "wx/scrolwin.h"
-#include "wx/scrolbar.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"
@@ -1111,7 +1111,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
 
     int direction, ascent, descent2;
     XCharStruct overall;
-    int slen = string.Len();
+    int slen = string.length();
 
     XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
                  &direction, &ascent, &descent2, &overall);

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 2d46ddb697aecba359f3f31e2868bfa5dd85c579..3916339bd53c8c28c67768185926b9d45ab48086 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.cpp
+// Name:        src/xrc/xh_scrol.cpp
 // Purpose:     XRC resource for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -18,7 +18,10 @@
 #if wxUSE_XRC && wxUSE_SCROLLBAR
 
 #include "wx/xrc/xh_scrol.h"
-#include "wx/scrolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/scrolbar.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)