From: Francesco Montorsi Date: Sat, 27 Dec 2008 18:42:33 +0000 (+0000) Subject: (blind) fix for unneeded inclusions of headers X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e7a89af32d371a2f90832f6e20d3da3ea1ce062 (blind) fix for unneeded inclusions of headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index dca650e0c8..00114ba89e 100644 --- a/src/osx/carbon/control.cpp +++ b/src/osx/carbon/control.cpp @@ -27,10 +27,6 @@ #include "wx/sizer.h" #endif // WX_PRECOMP -#include "wx/notebook.h" -#include "wx/tabctrl.h" -#include "wx/spinbutt.h" - #include "wx/osx/private.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp index bced016eb7..03eb2a00ad 100644 --- a/src/osx/carbon/stattext.cpp +++ b/src/osx/carbon/stattext.cpp @@ -23,9 +23,6 @@ #include "wx/settings.h" #endif // WX_PRECOMP -#include "wx/notebook.h" -#include "wx/tabctrl.h" - #include "wx/osx/private.h" #include @@ -104,14 +101,14 @@ wxSize wxStaticText::DoGetBestSize() const to allow correct dynamic ellipsizing of the label */ -wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, +wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, - long extraStyle) + long style, + long extraStyle) { Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size ); diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm index 973a7b2e9f..c1ed173666 100644 --- a/src/osx/cocoa/stattext.mm +++ b/src/osx/cocoa/stattext.mm @@ -23,9 +23,6 @@ #include "wx/settings.h" #endif // WX_PRECOMP -#include "wx/notebook.h" -#include "wx/tabctrl.h" - #include "wx/osx/private.h" #include @@ -92,14 +89,14 @@ wxSize wxStaticText::DoGetBestSize() const to allow correct dynamic ellipsizing of the label */ -wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, +wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, - long extraStyle) + long style, + long extraStyle) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r]; @@ -107,7 +104,7 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, [v setBezeled:NO]; [v setEditable:NO]; [v setDrawsBackground:NO]; - + wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); [v setImplementation:c]; return c;