From 851dee09b5ab50a69519a39b0f3f6b95b1a63373 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 30 May 2006 13:43:18 +0000 Subject: [PATCH] Include wx/scrolbar.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/scrolbar.mm | 8 +++++--- src/common/containr.cpp | 6 +----- src/common/wincmn.cpp | 5 +---- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/scrolbar.cpp | 3 ++- src/mac/carbon/window.cpp | 4 ++-- src/mac/classic/control.cpp | 2 +- src/mac/classic/scrolbar.cpp | 3 ++- src/mac/classic/window.cpp | 2 +- src/msw/scrolbar.cpp | 3 ++- src/msw/slider95.cpp | 4 ++-- src/os2/scrolbar.cpp | 3 ++- src/palmos/scrolbar.cpp | 3 ++- src/palmos/slider.cpp | 2 +- src/x11/window.cpp | 4 ++-- src/xrc/xh_scrol.cpp | 7 +++++-- 16 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/cocoa/scrolbar.mm b/src/cocoa/scrolbar.mm index 9a21343de6..81fa2c95fc 100644 --- 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 diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 185f8098d9..6869269051 100644 --- 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 c088059ccf..314d68ea0e 100644 --- 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 8d67b5b55f..ac344ddaa6 100644 --- 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 02e3d04bef..5f268188b9 100644 --- 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 dbf267960f..6c8a60d542 100644 --- 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 07c5a65932..2742383fe2 100644 --- 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 fc41820841..b2a54ee3a3 100644 --- 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 32504a03ab..3393452564 100644 --- 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 ea7ab3a869..d892916568 100644 --- 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 6b7d26723b..2a9a690577 100644 --- 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 88906bdef7..2f8a96dc82 100644 --- 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 3b3e2d1023..2efee6c5dd 100644 --- 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 49d00f8bee..be30bb7a7c 100644 --- 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 f2b103189c..edcaa1015b 100644 --- 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 2d46ddb697..3916339bd5 100644 --- 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) -- 2.45.2