No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it. Some files containing third-party sources (src/msw/wince/time.cpp, src/x11/pango*.cpp) were left unchanged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -22,7 +22,7 @@
|
||||
|
||||
#define wxOSX_USE_CORE_TEXT 0
|
||||
#define wxOSX_USE_ATSU_TEXT 0
|
||||
#define wxHAS_OPENGL_ES
|
||||
#define wxHAS_OPENGL_ES
|
||||
|
||||
/*
|
||||
* turning off capabilities that don't work under iphone yet
|
||||
@@ -85,21 +85,21 @@
|
||||
#define wxUSE_COMBOBOX 0
|
||||
#endif
|
||||
|
||||
#undef wxUSE_SCROLLBAR
|
||||
#undef wxUSE_SCROLLBAR
|
||||
#define wxUSE_SCROLLBAR 0
|
||||
|
||||
#undef wxUSE_STATUSBAR
|
||||
#undef wxUSE_NATIVE_STATUSBAR
|
||||
#undef wxUSE_TEXTCTRL
|
||||
#undef wxUSE_ABOUTDLG
|
||||
#undef wxUSE_STATTEXT
|
||||
#undef wxUSE_STATLINE
|
||||
#undef wxUSE_COLLPANE
|
||||
#undef wxUSE_STATBMP
|
||||
#undef wxUSE_STATBOX
|
||||
#undef wxUSE_STATUSBAR
|
||||
#undef wxUSE_NATIVE_STATUSBAR
|
||||
#undef wxUSE_TEXTCTRL
|
||||
#undef wxUSE_ABOUTDLG
|
||||
#undef wxUSE_STATTEXT
|
||||
#undef wxUSE_STATLINE
|
||||
#undef wxUSE_COLLPANE
|
||||
#undef wxUSE_STATBMP
|
||||
#undef wxUSE_STATBOX
|
||||
#undef wxUSE_CHECKBOX
|
||||
#undef wxUSE_RADIOBTN
|
||||
#undef wxUSE_RADIOBOX
|
||||
#undef wxUSE_RADIOBTN
|
||||
#undef wxUSE_RADIOBOX
|
||||
#undef wxUSE_TOGGLEBTN
|
||||
|
||||
|
||||
@@ -117,45 +117,45 @@
|
||||
#define wxUSE_RADIOBOX 0
|
||||
#define wxUSE_TOGGLEBTN 0
|
||||
|
||||
#undef wxUSE_TOOLBAR
|
||||
#undef wxUSE_HTML
|
||||
#undef wxUSE_TOOLBAR
|
||||
#undef wxUSE_HTML
|
||||
|
||||
#define wxUSE_TOOLBAR 0
|
||||
#define wxUSE_HTML 0
|
||||
|
||||
#undef wxUSE_RICHTEXT
|
||||
#undef wxUSE_RICHTEXT
|
||||
#define wxUSE_RICHTEXT 0
|
||||
|
||||
#undef wxUSE_ANIMATIONCTRL
|
||||
#undef wxUSE_CALENDARCTRL
|
||||
#undef wxUSE_COMBOCTRL
|
||||
#undef wxUSE_ODCOMBOBOX
|
||||
#undef wxUSE_BITMAPCOMBOBOX
|
||||
#undef wxUSE_BMPBUTTON
|
||||
#undef wxUSE_CHECKLISTBOX
|
||||
#undef wxUSE_GAUGE
|
||||
#undef wxUSE_GRID
|
||||
#undef wxUSE_LISTBOX
|
||||
#undef wxUSE_LISTCTRL
|
||||
#undef wxUSE_NOTEBOOK
|
||||
#undef wxUSE_SLIDER
|
||||
#undef wxUSE_SPINBTN
|
||||
#undef wxUSE_SPINCTRL
|
||||
#undef wxUSE_TREECTRL
|
||||
#undef wxUSE_DATEPICKCTRL
|
||||
#undef wxUSE_DATAVIEWCTRL
|
||||
#undef wxUSE_EDITABLELISTBOX
|
||||
#undef wxUSE_FILEPICKERCTRL
|
||||
#undef wxUSE_DIRPICKERCTRL
|
||||
#undef wxUSE_FILECTRL
|
||||
#undef wxUSE_COLOURPICKERCTRL
|
||||
#undef wxUSE_FONTPICKERCTRL
|
||||
#undef wxUSE_DEBUGREPORT
|
||||
#undef wxUSE_HYPERLINKCTRL
|
||||
#undef wxUSE_STC
|
||||
#undef wxUSE_ANIMATIONCTRL
|
||||
#undef wxUSE_CALENDARCTRL
|
||||
#undef wxUSE_COMBOCTRL
|
||||
#undef wxUSE_ODCOMBOBOX
|
||||
#undef wxUSE_BITMAPCOMBOBOX
|
||||
#undef wxUSE_BMPBUTTON
|
||||
#undef wxUSE_CHECKLISTBOX
|
||||
#undef wxUSE_GAUGE
|
||||
#undef wxUSE_GRID
|
||||
#undef wxUSE_LISTBOX
|
||||
#undef wxUSE_LISTCTRL
|
||||
#undef wxUSE_NOTEBOOK
|
||||
#undef wxUSE_SLIDER
|
||||
#undef wxUSE_SPINBTN
|
||||
#undef wxUSE_SPINCTRL
|
||||
#undef wxUSE_TREECTRL
|
||||
#undef wxUSE_DATEPICKCTRL
|
||||
#undef wxUSE_DATAVIEWCTRL
|
||||
#undef wxUSE_EDITABLELISTBOX
|
||||
#undef wxUSE_FILEPICKERCTRL
|
||||
#undef wxUSE_DIRPICKERCTRL
|
||||
#undef wxUSE_FILECTRL
|
||||
#undef wxUSE_COLOURPICKERCTRL
|
||||
#undef wxUSE_FONTPICKERCTRL
|
||||
#undef wxUSE_DEBUGREPORT
|
||||
#undef wxUSE_HYPERLINKCTRL
|
||||
#undef wxUSE_STC
|
||||
#undef wxUSE_AUI
|
||||
#undef wxUSE_BUSYINFO
|
||||
#undef wxUSE_SEARCHCTRL
|
||||
#undef wxUSE_BUSYINFO
|
||||
#undef wxUSE_SEARCHCTRL
|
||||
|
||||
#define wxUSE_ANIMATIONCTRL 0
|
||||
#define wxUSE_CALENDARCTRL 0
|
||||
@@ -188,27 +188,27 @@
|
||||
#define wxUSE_BUSYINFO 0
|
||||
#define wxUSE_SEARCHCTRL 0
|
||||
|
||||
#undef wxUSE_LOGWINDOW
|
||||
#undef wxUSE_LOG_DIALOG
|
||||
#undef wxUSE_LISTBOOK
|
||||
#undef wxUSE_CHOICEBOOK
|
||||
#undef wxUSE_TREEBOOK
|
||||
#undef wxUSE_TOOLBOOK
|
||||
#undef wxUSE_CHOICEDLG
|
||||
#undef wxUSE_HELP
|
||||
#undef wxUSE_PROGRESSDLG
|
||||
#undef wxUSE_FONTDLG
|
||||
#undef wxUSE_FILEDLG
|
||||
#undef wxUSE_CHOICEDLG
|
||||
#undef wxUSE_NUMBERDLG
|
||||
#undef wxUSE_TEXTDLG
|
||||
#undef wxUSE_DIRDLG
|
||||
#undef wxUSE_STARTUP_TIPS
|
||||
#undef wxUSE_WIZARDDLG
|
||||
#undef wxUSE_TOOLBAR_NATIVE
|
||||
#undef wxUSE_FINDREPLDLG
|
||||
#undef wxUSE_TASKBARICON
|
||||
#undef wxUSE_REARRANGECTRL
|
||||
#undef wxUSE_LOGWINDOW
|
||||
#undef wxUSE_LOG_DIALOG
|
||||
#undef wxUSE_LISTBOOK
|
||||
#undef wxUSE_CHOICEBOOK
|
||||
#undef wxUSE_TREEBOOK
|
||||
#undef wxUSE_TOOLBOOK
|
||||
#undef wxUSE_CHOICEDLG
|
||||
#undef wxUSE_HELP
|
||||
#undef wxUSE_PROGRESSDLG
|
||||
#undef wxUSE_FONTDLG
|
||||
#undef wxUSE_FILEDLG
|
||||
#undef wxUSE_CHOICEDLG
|
||||
#undef wxUSE_NUMBERDLG
|
||||
#undef wxUSE_TEXTDLG
|
||||
#undef wxUSE_DIRDLG
|
||||
#undef wxUSE_STARTUP_TIPS
|
||||
#undef wxUSE_WIZARDDLG
|
||||
#undef wxUSE_TOOLBAR_NATIVE
|
||||
#undef wxUSE_FINDREPLDLG
|
||||
#undef wxUSE_TASKBARICON
|
||||
#undef wxUSE_REARRANGECTRL
|
||||
|
||||
#define wxUSE_LOGWINDOW 0
|
||||
#define wxUSE_LOG_DIALOG 0
|
||||
|
||||
@@ -32,17 +32,17 @@ WX_UIImage WXDLLIMPEXP_CORE wxOSXCreateUIImageFromCGImage( CGImageRef image );
|
||||
class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
|
||||
{
|
||||
public :
|
||||
wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
|
||||
wxWidgetIPhoneImpl() ;
|
||||
~wxWidgetIPhoneImpl();
|
||||
|
||||
wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
|
||||
wxWidgetIPhoneImpl() ;
|
||||
~wxWidgetIPhoneImpl();
|
||||
|
||||
void Init();
|
||||
|
||||
|
||||
virtual bool IsVisible() const ;
|
||||
virtual void SetVisibility( bool visible );
|
||||
|
||||
|
||||
virtual void Raise();
|
||||
|
||||
|
||||
virtual void Lower();
|
||||
|
||||
virtual void ScrollRect( const wxRect *rect, int dx, int dy );
|
||||
@@ -67,7 +67,7 @@ public :
|
||||
|
||||
void RemoveFromParent();
|
||||
void Embed( wxWidgetImpl *parent );
|
||||
|
||||
|
||||
void SetDefaultButton( bool isDefault );
|
||||
void PerformClick();
|
||||
virtual void SetLabel(const wxString& title, wxFontEncoding encoding);
|
||||
@@ -82,7 +82,7 @@ public :
|
||||
virtual wxBitmap GetBitmap() const;
|
||||
virtual void SetBitmap( const wxBitmap& bitmap );
|
||||
virtual void SetBitmapPosition( wxDirection dir );
|
||||
|
||||
|
||||
void SetupTabs( const wxNotebook ¬ebook );
|
||||
void GetBestRect( wxRect *r ) const;
|
||||
bool IsEnabled() const;
|
||||
@@ -98,18 +98,18 @@ public :
|
||||
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
|
||||
|
||||
void InstallEventHandler( WXWidget control = NULL );
|
||||
|
||||
virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
|
||||
|
||||
virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
|
||||
|
||||
// thunk connected calls
|
||||
|
||||
|
||||
virtual void drawRect(CGRect* rect, WXWidget slf, void* _cmd);
|
||||
virtual void touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd);
|
||||
virtual bool becomeFirstResponder(WXWidget slf, void* _cmd);
|
||||
virtual bool resignFirstResponder(WXWidget slf, void* _cmd);
|
||||
|
||||
// action
|
||||
|
||||
|
||||
virtual void touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd);
|
||||
|
||||
protected:
|
||||
@@ -122,59 +122,59 @@ class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl
|
||||
public :
|
||||
wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ;
|
||||
wxNonOwnedWindowIPhoneImpl();
|
||||
|
||||
|
||||
virtual ~wxNonOwnedWindowIPhoneImpl();
|
||||
|
||||
|
||||
virtual void Destroy() ;
|
||||
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
|
||||
long style, long extraStyle, const wxString& name ) ;
|
||||
|
||||
|
||||
WXWindow GetWXWindow() const;
|
||||
void Raise();
|
||||
void Raise();
|
||||
void Lower();
|
||||
bool Show(bool show);
|
||||
bool Show(bool show);
|
||||
bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
|
||||
|
||||
|
||||
void Update();
|
||||
bool SetTransparent(wxByte alpha);
|
||||
bool SetBackgroundColour(const wxColour& col );
|
||||
void SetExtraStyle( long exStyle );
|
||||
bool SetBackgroundStyle(wxBackgroundStyle style);
|
||||
void SetExtraStyle( long exStyle );
|
||||
bool SetBackgroundStyle(wxBackgroundStyle style);
|
||||
bool CanSetTransparent();
|
||||
|
||||
void MoveWindow(int x, int y, int width, int height);
|
||||
void GetPosition( int &x, int &y ) const;
|
||||
void GetSize( int &width, int &height ) const;
|
||||
|
||||
void GetContentArea( int &left , int &top , int &width , int &height ) const;
|
||||
void GetContentArea( int &left , int &top , int &width , int &height ) const;
|
||||
bool SetShape(const wxRegion& region);
|
||||
|
||||
|
||||
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
|
||||
|
||||
|
||||
virtual bool IsMaximized() const;
|
||||
|
||||
|
||||
virtual bool IsIconized() const;
|
||||
|
||||
|
||||
virtual void Iconize( bool iconize );
|
||||
|
||||
|
||||
virtual void Maximize(bool maximize);
|
||||
|
||||
|
||||
virtual bool IsFullScreen() const;
|
||||
|
||||
|
||||
virtual bool ShowFullScreen(bool show, long style);
|
||||
|
||||
virtual void RequestUserAttention(int flags);
|
||||
|
||||
|
||||
virtual void ScreenToWindow( int *x, int *y );
|
||||
|
||||
|
||||
virtual void WindowToScreen( int *x, int *y );
|
||||
|
||||
|
||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||
protected :
|
||||
WX_UIWindow m_macWindow;
|
||||
void * m_macFullScreenData ;
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
|
||||
};
|
||||
};
|
||||
|
||||
#ifdef __OBJC__
|
||||
|
||||
@@ -182,14 +182,14 @@ protected :
|
||||
WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect );
|
||||
WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p );
|
||||
WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p );
|
||||
|
||||
CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
|
||||
|
||||
CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
|
||||
bool adjustForOrigin = true );
|
||||
|
||||
@interface wxUIButton : UIButton
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
|
||||
|
||||
Reference in New Issue
Block a user