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:
@@ -20,8 +20,8 @@
|
||||
#define wxOSX_USE_NATIVE_TOOLBAR 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* text rendering system
|
||||
/*
|
||||
* text rendering system
|
||||
*/
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
||||
|
@@ -104,7 +104,7 @@ public:
|
||||
{
|
||||
return this->m_NativeColumnPtr;
|
||||
}
|
||||
|
||||
|
||||
void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr)
|
||||
{
|
||||
this->m_NativeColumnPtr = newNativeColumnPtr;
|
||||
@@ -235,11 +235,11 @@ private:
|
||||
NSMutableArray* children; // buffered children
|
||||
|
||||
NSMutableSet* items; // stores all items that are in use by the control
|
||||
|
||||
|
||||
wxCocoaDataViewControl* implementation;
|
||||
|
||||
|
||||
wxDataViewModel* model;
|
||||
|
||||
|
||||
wxPointerObject* currentParentItem; // parent of the buffered children; the object is owned
|
||||
}
|
||||
|
||||
@@ -338,11 +338,11 @@ private:
|
||||
@private
|
||||
CGFloat xImageShift; // shift for the image in x-direction from border
|
||||
CGFloat spaceImageText; // space between image and text ("belongs" to the image)
|
||||
|
||||
|
||||
NSImage* image; // the image itself
|
||||
|
||||
|
||||
NSSize imageSize; // largest size of the image; default size is (16, 16)
|
||||
|
||||
|
||||
NSTextAlignment cellAlignment; // the text alignment is used to align the whole
|
||||
// cell (image and text)
|
||||
}
|
||||
|
@@ -60,17 +60,17 @@ WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname
|
||||
class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
|
||||
{
|
||||
public :
|
||||
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
|
||||
wxWidgetCocoaImpl() ;
|
||||
~wxWidgetCocoaImpl();
|
||||
|
||||
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
|
||||
wxWidgetCocoaImpl() ;
|
||||
~wxWidgetCocoaImpl();
|
||||
|
||||
void Init();
|
||||
|
||||
|
||||
virtual bool IsVisible() const ;
|
||||
virtual void SetVisibility(bool);
|
||||
|
||||
virtual void Raise();
|
||||
|
||||
|
||||
virtual void Lower();
|
||||
|
||||
virtual void ScrollRect( const wxRect *rect, int dx, int dy );
|
||||
@@ -124,11 +124,11 @@ public :
|
||||
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
|
||||
|
||||
void InstallEventHandler( WXWidget control = NULL );
|
||||
|
||||
virtual bool DoHandleMouseEvent(NSEvent *event);
|
||||
|
||||
virtual bool DoHandleMouseEvent(NSEvent *event);
|
||||
virtual bool DoHandleKeyEvent(NSEvent *event);
|
||||
virtual bool DoHandleCharEvent(NSEvent *event, NSString *text);
|
||||
virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
|
||||
virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
|
||||
|
||||
void SetFlipped(bool flipped);
|
||||
virtual bool IsFlipped() const { return m_isFlipped; }
|
||||
@@ -149,7 +149,7 @@ public :
|
||||
virtual void resetCursorRects(WXWidget slf, void* _cmd);
|
||||
virtual bool isFlipped(WXWidget slf, void* _cmd);
|
||||
virtual void drawRect(void* rect, WXWidget slf, void* _cmd);
|
||||
|
||||
|
||||
virtual void controlAction(WXWidget slf, void* _cmd, void* sender);
|
||||
virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
|
||||
|
||||
@@ -158,9 +158,9 @@ protected:
|
||||
NSEvent* m_lastKeyDownEvent;
|
||||
bool m_isFlipped;
|
||||
// if it the control has an editor, that editor will already send some
|
||||
// events, don't resend them
|
||||
// events, don't resend them
|
||||
bool m_hasEditor;
|
||||
|
||||
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
|
||||
};
|
||||
|
||||
@@ -171,59 +171,59 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
|
||||
public :
|
||||
wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
|
||||
wxNonOwnedWindowCocoaImpl();
|
||||
|
||||
|
||||
virtual ~wxNonOwnedWindowCocoaImpl();
|
||||
|
||||
|
||||
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_wxNSWindow m_macWindow;
|
||||
void * m_macFullScreenData ;
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
|
||||
};
|
||||
};
|
||||
|
||||
#ifdef __OBJC__
|
||||
|
||||
@@ -231,16 +231,16 @@ protected :
|
||||
WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
|
||||
WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
|
||||
WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
|
||||
|
||||
NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
|
||||
|
||||
NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
|
||||
bool adjustForOrigin = true );
|
||||
|
||||
|
||||
// used for many wxControls
|
||||
|
||||
|
||||
@interface wxNSButton : NSButton
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@interface wxNSBox : NSBox
|
||||
@@ -276,7 +276,7 @@ protected :
|
||||
@interface wxNSTextView : NSTextView
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@interface wxNSMenu : NSMenu
|
||||
@@ -287,7 +287,7 @@ protected :
|
||||
- (void) setImplementation:(wxMenuImpl*) item;
|
||||
- (wxMenuImpl*) implementation;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
||||
@interface wxNSMenuItem : NSMenuItem
|
||||
{
|
||||
@@ -300,8 +300,8 @@ protected :
|
||||
- (void)clickedAction:(id)sender;
|
||||
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
|
||||
|
||||
@end
|
||||
|
||||
@end
|
||||
|
||||
void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
|
||||
|
||||
/*
|
||||
|
@@ -32,7 +32,7 @@ public :
|
||||
virtual void GetSelection( long* from, long* to) const ;
|
||||
virtual void SetSelection( long from , long to );
|
||||
virtual void WriteText(const wxString& str) ;
|
||||
|
||||
|
||||
virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
|
||||
protected :
|
||||
NSTextField* m_textField;
|
||||
|
Reference in New Issue
Block a user