Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(blind) fix for unneeded inclusions of headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-27 18:42:33 +00:00
parent 355b0cb3c7
commit 6e7a89af32
3 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/control.cpp
View File

@@ -27,10 +27,6 @@
#include "wx/sizer.h" #include "wx/sizer.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/notebook.h"
#include "wx/tabctrl.h"
#include "wx/spinbutt.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)

15
src/osx/carbon/stattext.cpp
View File

@@ -23,9 +23,6 @@
#include "wx/settings.h" #include "wx/settings.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/notebook.h"
#include "wx/tabctrl.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include <stdio.h> #include <stdio.h>
@@ -104,14 +101,14 @@ wxSize wxStaticText::DoGetBestSize() const
to allow correct dynamic ellipsizing of the label to allow correct dynamic ellipsizing of the label
*/ */
wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxString& label, const wxString& label,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) long extraStyle)
{ {
Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size ); Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

17
src/osx/cocoa/stattext.mm
View File

@@ -23,9 +23,6 @@
#include "wx/settings.h" #include "wx/settings.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/notebook.h"
#include "wx/tabctrl.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include <stdio.h> #include <stdio.h>
@@ -92,14 +89,14 @@ wxSize wxStaticText::DoGetBestSize() const
to allow correct dynamic ellipsizing of the label to allow correct dynamic ellipsizing of the label
*/ */
wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxString& label, const wxString& label,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) long extraStyle)
{ {
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r]; wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];
@@ -107,7 +104,7 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
[v setBezeled:NO]; [v setBezeled:NO];
[v setEditable:NO]; [v setEditable:NO];
[v setDrawsBackground:NO]; [v setDrawsBackground:NO];
wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
[v setImplementation:c]; [v setImplementation:c];
return c; return c;