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

No changes, just removed hard tabs and trailing white space.

Browse Source 
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
2009-08-21 10:41:26 +00:00
parent 545cb3fcf2
commit 03647350fc
436 changed files with 2774 additions and 2769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/bmpbuttn.h
View File

@@ -23,7 +23,7 @@ public:
{
SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
}
wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
@@ -40,7 +40,7 @@ public:
const wxString& name = wxButtonNameStr);
protected:
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);

4
include/wx/osx/carbon/chkconf.h
View File

@@ -27,8 +27,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

8
include/wx/osx/carbon/dataview.h
View File

@@ -41,7 +41,7 @@ public:
{
return this->m_PropertyID;
}
void SetPropertyID(DataBrowserPropertyID newPropertyID)
{
this->m_PropertyID = newPropertyID;
@@ -189,7 +189,7 @@ public:
OSStatus GetPropertyFlags (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags ) const;
OSStatus GetPropertyID (DataBrowserItemDataRef itemData, DataBrowserPropertyID* propertyID) const; // returns for the passed item data reference the corresponding property ID
OSStatus GetPropertyID (DataBrowserTableViewColumnIndex index, DataBrowserPropertyID* propertyID) const; // returns for the passed column index the corresponding property ID
OSStatus IsUsedPropertyID(DataBrowserPropertyID propertyID) const; // checks if passed property id is used by the control; no error is returned if the id exists
OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);
@@ -270,7 +270,7 @@ public:
// container handling
//
OSStatus CloseContainer(DataBrowserItemID containerID);
OSStatus OpenContainer(DataBrowserItemID containerID);
protected :
@@ -315,7 +315,7 @@ protected :
// event handler for hit testing
///
void* m_macDataViewCtrlEventHandler;
private:
//
// wxWidget internal stuff

70
include/wx/osx/carbon/private.h
View File

@@ -302,12 +302,12 @@ public :
virtual bool IsVisible() const;
virtual void Raise();
virtual void Lower();
virtual void ScrollRect( const wxRect *rect, int dx, int dy );
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const;
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const;
virtual void Move(int x, int y, int width, int height);
virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const;
@@ -316,7 +316,7 @@ public :
// where is in native window relative coordinates
virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const;
virtual bool CanFocus() const;
// return true if successful
virtual bool SetFocus();
@@ -324,7 +324,7 @@ public :
void RemoveFromParent();
void Embed( wxWidgetImpl *parent );
void SetDefaultButton( bool isDefault );
void PerformClick();
void SetLabel( const wxString& title, wxFontEncoding encoding );
@@ -369,7 +369,7 @@ public :
virtual wxInt32 GetMaximum() const;
virtual wxInt32 GetMinimum() const;
virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum );
virtual void SetRange( SInt32 minimum , SInt32 maximum );
@@ -451,7 +451,7 @@ public :
virtual void GetFeatures( UInt32 *features );
// to be moved into a tab control class
virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable );
@@ -640,7 +640,7 @@ public :
} ;
*/
class WXDLLIMPEXP_CORE wxMacDataItem
class WXDLLIMPEXP_CORE wxMacDataItem
{
public :
wxMacDataItem();
@@ -817,7 +817,7 @@ protected :
class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn
{
public :
wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable )
wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable )
: m_property(propertyId), m_editable(editable), m_type( colType )
{
}
@@ -825,9 +825,9 @@ public :
{
}
DataBrowserPropertyID GetProperty() const { return m_property ; }
bool IsEditable() const { return m_editable; }
DataBrowserPropertyType GetType() const { return m_type; }
protected :
@@ -844,12 +844,12 @@ class WXDLLIMPEXP_CORE wxMacDataBrowserCellValue : public wxListWidgetCellValue
public :
wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {}
virtual ~wxMacDataBrowserCellValue() {}
virtual void Set( CFStringRef value );
virtual void Set( const wxString& value );
virtual void Set( int value ) ;
virtual void Check( bool check );
virtual int GetIntValue() const ;
virtual wxString GetStringValue() const ;
protected :
@@ -868,10 +868,10 @@ public:
wxListWidgetColumn* InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
wxListWidgetColumn* InsertCheckColumn( unsigned int pos , const wxString& title, bool editable = false,
wxListWidgetColumn* InsertCheckColumn( unsigned int pos , const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
wxMacDataBrowserColumn* DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,
wxMacDataBrowserColumn* DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,
const wxString& title, bool editable,
DataBrowserPropertyType colType, SInt16 just, int width );
// add and remove
@@ -1000,51 +1000,51 @@ public :
wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
wxNonOwnedWindowCarbonImpl();
virtual ~wxNonOwnedWindowCarbonImpl();
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 );
bool MacGetUnifiedAppearance() const ;
void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
@@ -1052,18 +1052,18 @@ public :
void MacSetMetalAppearance( bool set ) ;
bool MacGetMetalAppearance() const ;
void MacSetUnifiedAppearance( bool set );
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected :
void MacInstallTopLevelWindowEventHandler();
WXEVENTHANDLERREF m_macEventHandler ;
WindowRef m_macWindow;
void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
};
#endif // wxUSE_GUI

20
include/wx/osx/carbon/private/overlay.h
View File

@@ -21,34 +21,34 @@ class wxOverlayImpl
public:
wxOverlayImpl() ;
~wxOverlayImpl() ;
// clears the overlay without restoring the former state
// to be done eg when the window content has been changed and repainted
void Reset();
// returns true if it has been setup
bool IsOk();
void Init( wxDC* dc, int x , int y , int width , int height );
void BeginDrawing( wxDC* dc);
void EndDrawing( wxDC* dc);
void Clear( wxDC* dc);
private:
OSStatus CreateOverlayWindow();
void MacGetBounds( Rect *bounds );
WindowRef m_overlayWindow;
WindowRef m_overlayParentWindow;
CGContextRef m_overlayContext ;
// we store the window in case we would have to issue a Refresh()
wxWindow* m_window ;
int m_x ;
int m_y ;
int m_width ;

8
include/wx/osx/carbon/private/print.h
View File

@@ -34,10 +34,10 @@ public:
virtual void TransferFrom( wxPrintDialogData * );
virtual void TransferTo( wxPrintDialogData * );
PMPrintSession GetPrintSession() { return m_macPrintSession; }
PMPageFormat GetPageFormat() { return m_macPageFormat; }
PMPrintSettings GetPrintSettings() { return m_macPrintSettings; }
PMPrintSession GetPrintSession() { return m_macPrintSession; }
PMPageFormat GetPageFormat() { return m_macPageFormat; }
PMPrintSettings GetPrintSettings() { return m_macPrintSettings; }
protected :
virtual void UpdateFromPMState();
virtual void UpdateToPMState();

2
include/wx/osx/carbon/statbmp.h
View File

@@ -58,7 +58,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
virtual wxSize DoGetBestSize() const;
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
};
#endif

2
include/wx/osx/checkbox.h
View File

@@ -37,7 +37,7 @@ public:
virtual void Command(wxCommandEvent& event);
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:
void DoSet3StateValue(wxCheckBoxState val);

2
include/wx/osx/checklst.h
View File

@@ -81,7 +81,7 @@ protected:
// the array containing the checked status of the items
wxArrayInt m_checks;
wxListWidgetColumn* m_checkColumn ;
void Init();

6
include/wx/osx/chkconf.h
View File

@@ -40,7 +40,7 @@
* we only use core graphics now on all builds, try to catch attempts
* to configure the build otherwise and give error messages
*/
#if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )
# error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
#endif
@@ -48,7 +48,7 @@
/*
* using mixins of cocoa functionality
*/
#ifdef __WXOSX_COCOA__
#define wxOSX_USE_COCOA 1
#else
@@ -83,7 +83,7 @@
/*
* combination flags
*/
#if wxOSX_USE_COCOA || wxOSX_USE_CARBON
#define wxOSX_USE_COCOA_OR_CARBON 1
#else

2
include/wx/osx/choice.h
View File

@@ -77,7 +77,7 @@ public:
virtual wxString GetString(unsigned int n) const ;
virtual void SetString(unsigned int pos, const wxString& s);
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:

4
include/wx/osx/cocoa/chkconf.h
View File

@@ -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

14
include/wx/osx/cocoa/dataview.h
View File

@@ -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)
}

82
include/wx/osx/cocoa/private.h
View File

@@ -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);
/*

2
include/wx/osx/cocoa/private/textimpl.h
View File

@@ -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;

4
include/wx/osx/config_xcode.h
View File

@@ -2,7 +2,7 @@
// Name: config_xcode.pch
// Purpose: configurations for xcode builds
// Author: Stefan Csomor
// Modified by:
// Modified by:
// Created: 29.04.04
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
@@ -135,7 +135,7 @@
#define HAVE_STDLIB_H 1
// OBSOLETE ?
#define HAVE_COS 1
#define HAVE_FLOOR 1
#define HAVE_INTTYPES_H 1

8
include/wx/osx/core/cfdataref.h
View File

@@ -2,7 +2,7 @@
// Name: wx/mac/corefoundation/cfdata.h
// Purpose: wxCFDataRef class
// Author: Stefan Csomor
// Modified by:
// Modified by:
// Created: 2007/05/10
// RCS-ID: $Id: cfdataref.h 46095 2007-05-18 07:29:49Z SC $
// Copyright: (c) 2007 Stefan Csomor
@@ -33,7 +33,7 @@ public:
{}
typedef wxCFRef<CFDataRef> super_type;
/*! @method wxCFDataRef
@abstract Assumes ownership of p and creates a reference to it.
@templatefield otherType Any type.
@@ -65,7 +65,7 @@ public:
@param data The raw data.
@param length The data length.
*/
wxCFDataRef(const UInt8* data, CFIndex length)
wxCFDataRef(const UInt8* data, CFIndex length)
: super_type(CFDataCreate(kCFAllocatorDefault, data, length))
{
}
@@ -80,7 +80,7 @@ public:
else
return 0;
}
/*! @method GetBytes
@abstract Copies the data into an external buffer
@param range The desired range.

8
include/wx/osx/core/cfstring.h
View File

@@ -49,18 +49,18 @@ public:
#if wxOSX_USE_COCOA_OR_IPHONE
wxCFStringRef(NSString* ref)
: wxCFRef< CFStringRef >((CFStringRef) ref)
: wxCFRef< CFStringRef >((CFStringRef) ref)
{
}
#endif
wxCFStringRef(CFStringRef ref)
: wxCFRef< CFStringRef >(ref)
: wxCFRef< CFStringRef >(ref)
{
}
wxCFStringRef(const wxCFStringRef& otherRef )
: wxCFRef< CFStringRef >(otherRef)
: wxCFRef< CFStringRef >(otherRef)
{
}
@@ -69,7 +69,7 @@ public:
}
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
#if wxOSX_USE_COCOA_OR_IPHONE
static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

2
include/wx/osx/core/dataview.h
View File

@@ -22,7 +22,7 @@ typedef wxWidgetImpl wxWidgetImplType;
// ---------------------------------------------------------
// Helper functions for dataview implementation on OSX
// ---------------------------------------------------------
wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id,
wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id,
wxPoint const& pos, wxSize const& size,
long style, long extraStyle);
wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control

2
include/wx/osx/core/mimetype.h
View File

@@ -79,7 +79,7 @@ protected:
wxString GetCommand(const wxString &verb, size_t nIndex) const;
// Read XDG *.desktop file
// Read XDG *.desktop file
void LoadXDGApp(const wxString& filename);
// Scan XDG directory
void LoadXDGAppsFilesFromDir(const wxString& dirname);

330
include/wx/osx/core/private.h
View File

@@ -62,7 +62,7 @@ private:
class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
{
public :
wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)
wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)
{
}
virtual ~wxDeferredObjectDeleter()
@@ -104,20 +104,20 @@ typedef wxWidgetImpl wxWidgetImplType;
#endif
#if wxUSE_MENUS
class wxMenuItemImpl : public wxObject
class wxMenuItemImpl : public wxObject
{
public :
wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
{
}
virtual ~wxMenuItemImpl() ;
virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
virtual void Enable( bool enable ) = 0;
virtual void Check( bool check ) = 0;
virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
virtual void Hide( bool hide = true ) = 0;
virtual void * GetHMenuItem() = 0;
wxMenuItem* GetWXPeer() { return m_peer ; }
@@ -132,27 +132,27 @@ public :
protected :
wxMenuItem* m_peer;
DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
} ;
class wxMenuImpl : public wxObject
class wxMenuImpl : public wxObject
{
public :
wxMenuImpl( wxMenu* peer ) : m_peer(peer)
{
}
virtual ~wxMenuImpl() ;
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;
virtual ~wxMenuImpl() ;
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;
virtual void Remove( wxMenuItem *pItem ) = 0;
virtual void MakeRoot() = 0;
virtual void SetTitle( const wxString& text ) = 0;
virtual WXHMENU GetHMenu() = 0;
wxMenu* GetWXPeer() { return m_peer ; }
virtual void PopUp( wxWindow *win, int x, int y ) = 0;
@@ -161,7 +161,7 @@ public :
static wxMenuImpl* CreateRootMenu( wxMenu* peer );
protected :
wxMenu* m_peer;
DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
} ;
#endif
@@ -179,7 +179,7 @@ public :
bool IsRootControl() const { return m_isRootControl; }
wxWindowMac* GetWXPeer() const { return m_wxPeer; }
bool IsOk() const { return GetWXWidget() != NULL; }
// not only the control itself, but also all its parents must be visible
@@ -189,13 +189,13 @@ public :
virtual void SetVisibility( bool visible ) = 0;
virtual void Raise() = 0;
virtual void Lower() = 0;
virtual void ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
virtual WXWidget GetWXWidget() const = 0;
virtual void SetBackgroundColour( const wxColour& col ) = 0;
// all coordinates in native parent widget relative coordinates
@@ -221,10 +221,10 @@ public :
// return true if successful
virtual bool SetFocus() = 0;
virtual bool HasFocus() const = 0;
virtual void RemoveFromParent() = 0;
virtual void Embed( wxWidgetImpl *parent ) = 0;
virtual void SetDefaultButton( bool isDefault ) = 0;
virtual void PerformClick() = 0;
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
@@ -254,202 +254,202 @@ public :
// is the clicked event sent AFTER the state already changed, so no additional
// state changing logic is required from the outside
virtual bool ButtonClickDidStateChange() = 0;
virtual void InstallEventHandler( WXWidget control = NULL ) = 0;
// static methods for associating native controls and their implementations
static wxWidgetImpl*
static wxWidgetImpl*
FindFromWXWidget(WXWidget control);
static void RemoveAssociations( wxWidgetImpl* impl);
static void Associate( WXWidget control, wxWidgetImpl *impl );
static WXWidget FindFocus();
// static creation methods, must be implemented by all toolkits
static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ;
static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& content,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& content,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle) ;
static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle);
static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle);
static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
wxInt32 value,
wxInt32 minimum,
wxInt32 maximum,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
wxInt32 value,
wxInt32 minimum,
wxInt32 maximum,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
wxInt32 value,
wxInt32 minimum,
wxInt32 maximum,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
wxMenu* menu,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
// converts from Toplevel-Content relative to local
@@ -467,7 +467,7 @@ protected :
// the interface to be implemented eg by a listbox
//
class WXDLLIMPEXP_CORE wxListWidgetColumn
class WXDLLIMPEXP_CORE wxListWidgetColumn
{
public :
virtual ~wxListWidgetColumn() {}
@@ -478,12 +478,12 @@ class WXDLLIMPEXP_CORE wxListWidgetCellValue
public :
wxListWidgetCellValue() {}
virtual ~wxListWidgetCellValue() {}
virtual void Set( CFStringRef value ) = 0;
virtual void Set( const wxString& value ) = 0;
virtual void Set( int value ) = 0;
virtual void Check( bool check );
virtual bool IsChecked() const;
virtual int GetIntValue() const = 0;
virtual wxString GetStringValue() const = 0;
@@ -494,12 +494,12 @@ class WXDLLIMPEXP_CORE wxListWidgetImpl
public:
wxListWidgetImpl() {}
virtual ~wxListWidgetImpl() { }
virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
// add and remove
// TODO will be replaced
@@ -514,7 +514,7 @@ public:
virtual int ListGetSelection() const = 0;
virtual int ListGetSelections( wxArrayInt& aSelections ) const = 0;
virtual bool ListIsSelected( unsigned int n ) const = 0;
// display
virtual void ListScrollTo( unsigned int n ) = 0;
@@ -618,21 +618,21 @@ public :
virtual ~wxNonOwnedWindowImpl()
{
}
virtual void Destroy()
virtual void Destroy()
{
}
virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) = 0;
virtual WXWindow GetWXWindow() const = 0;
virtual void Raise()
{
}
virtual void Lower()
{
}
@@ -641,12 +641,12 @@ public :
{
return false;
}
virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
{
return Show(show);
}
virtual void Update()
{
}
@@ -664,18 +664,18 @@ public :
virtual void SetExtraStyle( long WXUNUSED(exStyle) )
{
}
virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
{
{
return false ;
}
bool CanSetTransparent()
{
return false;
}
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
virtual void MoveWindow(int x, int y, int width, int height) = 0;
virtual void GetPosition( int &x, int &y ) const = 0;
virtual void GetSize( int &width, int &height ) const = 0;
@@ -684,31 +684,31 @@ public :
{
return false;
}
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;
virtual bool IsMaximized() const = 0;
virtual bool IsIconized() const= 0;
virtual void Iconize( bool iconize )= 0;
virtual void Maximize(bool maximize) = 0;
virtual bool IsFullScreen() const= 0;
virtual bool ShowFullScreen(bool show, long style)= 0;
virtual void RequestUserAttention(int flags) = 0;
virtual void ScreenToWindow( int *x, int *y ) = 0;
virtual void ScreenToWindow( int *x, int *y ) = 0;
virtual void WindowToScreen( int *x, int *y ) = 0;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
// static creation methods, must be implemented by all toolkits
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ;

2
include/wx/osx/dataobj2.h
View File

@@ -68,7 +68,7 @@ public:
// ----------------------------------
void AddFile( const wxString &filename );
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);

4
include/wx/osx/dataview.h
View File

@@ -32,7 +32,7 @@ public:
// constructors / destructor
//
wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);
virtual ~wxDataViewRenderer(void);
//
@@ -400,7 +400,7 @@ public:
{
return this->m_NativeDataPtr;
}
void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
void SetWidthVariable(int NewWidth)
{

10
include/wx/osx/dcmemory.h
View File

@@ -19,12 +19,12 @@ class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
public:
wxMemoryDCImpl( wxMemoryDC *owner );
wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
virtual ~wxMemoryDCImpl();
virtual void DoGetSize( int *width, int *height ) const;
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
virtual void DoSelect(const wxBitmap& bitmap);
@@ -32,12 +32,12 @@ public:
{ return m_selected; }
virtual wxBitmap& GetSelectedBitmap()
{ return m_selected; }
private:
void Init();
wxBitmap m_selected;
DECLARE_CLASS(wxMemoryDCImpl)
wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
};

2
include/wx/osx/dcscreen.h
View File

@@ -24,7 +24,7 @@ public:
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
private:
void* m_overlayWindow;
private:
DECLARE_CLASS(wxScreenDCImpl)
wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);

2
include/wx/osx/dnd.h
View File

@@ -55,7 +55,7 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData();
// NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
// NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
virtual wxDataFormat GetMatchingPair();
bool CurrentDragHasSupportedFormat() ;

6
include/wx/osx/font.h
View File

@@ -60,7 +60,7 @@ public:
{
Create(size, family, style, weight, underlined, face, encoding);
}
wxFont(const wxSize& pixelSize,
wxFontFamily family,
wxFontStyle style,
@@ -72,7 +72,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize);
}
bool Create(int size,
wxFontFamily family,
wxFontStyle style,
@@ -91,7 +91,7 @@ public:
bool Create(const wxNativeFontInfo& info);
bool CreateSystemFont(wxOSXSystemFont font);
virtual ~wxFont();
// implement base class pure virtuals

2
include/wx/osx/frame.h
View File

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
{
public:
// construction

4
include/wx/osx/glcanvas.h
View File

@@ -40,7 +40,7 @@ public:
// Mac-specific
WXGLContext GetWXGLContext() const { return m_glContext; }
private:
WXGLContext m_glContext;
@@ -139,7 +139,7 @@ public:
virtual void MacVisibilityChanged();
void MacUpdateView();
GLint GetAglBufferName() const { return m_bufferName; }
#endif

12
include/wx/osx/imaglist.h
View File

@@ -27,10 +27,10 @@ public:
virtual ~wxImageList();
bool Create( int width, int height, bool mask = true, int initialCount = 1 );
bool Create();
virtual int GetImageCount() const;
virtual bool GetSize( int index, int &width, int &height ) const;
int Add( const wxIcon& bitmap );
int Add( const wxBitmap& bitmap );
int Add( const wxBitmap& bitmap, const wxBitmap& mask );
@@ -42,17 +42,17 @@ public:
bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
bool Remove( int index );
bool RemoveAll();
virtual bool Draw(int index, wxDC& dc, int x, int y,
int flags = wxIMAGELIST_DRAW_NORMAL,
bool solidBackground = false);
private:
wxList m_images;
int m_width;
int m_height;
DECLARE_DYNAMIC_CLASS(wxImageList)
};

132
include/wx/osx/iphone/chkconf.h
View File

@@ -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

72
include/wx/osx/iphone/private.h
View File

@@ -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 &notebook );
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);

14
include/wx/osx/listbox.h
View File

@@ -90,7 +90,7 @@ public:
const wxString& name = wxListBoxNameStr);
virtual ~wxListBox();
// implement base class pure virtuals
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
@@ -102,7 +102,7 @@ public:
// data callbacks
virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
virtual bool IsSelected(int n) const;
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
@@ -119,7 +119,7 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
wxListWidgetImpl* GetListPeer() const;
bool MacGetBlockEvents() const { return m_blockEvents; }
virtual void HandleLineEvent( unsigned int n, bool doubleClick );
@@ -151,11 +151,11 @@ protected:
virtual wxSize DoGetBestSize() const;
bool m_blockEvents;
wxListWidgetColumn* m_textColumn;
// data storage (copied from univ)
// the array containing all items (it is sorted if the listbox has
// wxLB_SORT style)
union
@@ -166,7 +166,7 @@ protected:
// and this one the client data (either void or wxClientData)
wxArrayPtrVoid m_itemsClientData;
private:
DECLARE_DYNAMIC_CLASS(wxListBox)
DECLARE_EVENT_TABLE()

16
include/wx/osx/menu.h
View File

@@ -58,20 +58,20 @@ public:
void HandleMenuClosed();
wxMenuImpl* GetPeer() { return m_peer; }
// make sure we can veto
void SetAllowRearrange( bool allow );
bool AllowRearrange() const { return m_allowRearrange; }
// if a menu is used purely for internal implementation reasons (eg wxChoice)
// we don't want native menu events being triggered
void SetNoEventsMode( bool noEvents );
bool GetNoEventsMode() const { return m_noEventsMode; }
protected:
// hide special menu items like exit, preferences etc
// that are expected in the app menu
// that are expected in the app menu
void DoRearrange() ;
bool DoHandleMenuEvent( wxEvent& evt );
virtual wxMenuItem* DoAppend(wxMenuItem *item);
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
@@ -92,13 +92,13 @@ private:
// in this menu rearranging of menu items (esp hiding) is allowed
bool m_allowRearrange;
// don't trigger native events
bool m_noEventsMode;
// the position of the first item in the current radio group or -1
int m_startRadioGroup;
wxMenuImpl* m_peer;
DECLARE_DYNAMIC_CLASS(wxMenu)
@@ -187,7 +187,7 @@ protected:
private:
static wxMenuBar* s_macInstalledMenuBar ;
static wxMenuBar* s_macCommonMenuBar ;
wxMenu* m_rootMenu;
wxMenu* m_appleMenu;

2
include/wx/osx/menuitem.h
View File

@@ -75,7 +75,7 @@ private:
wxBitmap m_bitmap; // Bitmap for menuitem, if any
void* m_menu ; // the appropriate menu , may also be a system menu
wxMenuItemImpl* m_peer;
DECLARE_DYNAMIC_CLASS(wxMenuItem)

12
include/wx/osx/nonownedwnd.h
View File

@@ -2,7 +2,7 @@
// Name: wx/mac/nonownedwnd.h
// Purpose: declares wxNonOwnedWindow class
// Author: Stefan Csomor
// Modified by:
// Modified by:
// Created: 2008-03-24
// RCS-ID: $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $
// Copyright: (c) 2008 Stefan Csomor
@@ -65,7 +65,7 @@ public:
virtual bool CanSetTransparent();
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
virtual void Update();
WXWindow GetWXWindow() const ;
@@ -94,16 +94,16 @@ public:
virtual void SetExtraStyle(long exStyle) ;
virtual bool SetBackgroundColour( const wxColour &colour );
wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
// osx specific event handling common for all osx-ports
virtual void HandleActivated( double timestampsec, bool didActivate );
virtual void HandleResized( double timestampsec );
virtual void HandleMoved( double timestampsec );
virtual void HandleResizing( double timestampsec, wxRect* rect );
protected:
// common part of all ctors
void Init();

4
include/wx/osx/notebook.h
View File

@@ -82,7 +82,7 @@ public:
// hit test
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
// calculate size for wxNotebookSizer
wxSize CalcSizeFromPage(const wxSize& sizePage) const;
wxRect GetPageRect() const ;
@@ -118,7 +118,7 @@ public:
// -------------------
virtual void Command(wxCommandEvent& event);
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:

2
include/wx/osx/pnghand.h
View File

@@ -2,7 +2,7 @@
// Name: pnghand.h
// Purpose: PNG bitmap handler
// Author: Julian Smart
// Modified by:
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart

2
include/wx/osx/popupwin.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxPopupWindow class for wxMac
// Author: Stefan Csomor
// Modified by:
// Created:
// Created:
// RCS-ID: $Id$
// Copyright: (c) 2006 Stefan Csomor
// Licence: wxWindows licence

16
include/wx/osx/printdlg.h
View File

@@ -18,7 +18,7 @@
#include "wx/cmndata.h"
#include "wx/printdlg.h"
#include "wx/prntbase.h"
/*
* wxMacPrintDialog
* The Mac dialog for printing
@@ -45,7 +45,7 @@ private:
wxDC* m_printerDC;
bool m_destroyDC;
wxWindow* m_dialogParent;
private:
DECLARE_DYNAMIC_CLASS(wxPrintDialog)
};
@@ -62,14 +62,14 @@ public:
virtual ~wxMacPageSetupDialog();
virtual wxPageSetupData& GetPageSetupDialogData();
bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
virtual int ShowModal();
private:
wxPageSetupData m_pageSetupData;
wxWindow* m_dialogParent;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
};
@@ -93,17 +93,17 @@ public:
private:
wxPageSetupData* m_pageSetupDialogData;
wxPoint m_MinMarginTopLeft;
wxPoint m_MinMarginBottomRight;
wxTextCtrl *m_LeftMargin;
wxTextCtrl *m_TopMargin;
wxTextCtrl *m_RightMargin;
wxTextCtrl *m_BottomMargin;
void GetMinMargins();
bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
};

4
include/wx/osx/printmac.h
View File

@@ -17,7 +17,7 @@
/*
* Represents the printer: manages printing a wxPrintout object
*/
class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
{
DECLARE_DYNAMIC_CLASS(wxMacPrinter)
@@ -38,7 +38,7 @@ class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
* wxPrintPreview
* Programmer creates an object of this class to preview a wxPrintout.
*/
class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
{
DECLARE_CLASS(wxMacPrintPreview)

10
include/wx/osx/radiobut.h
View File

@@ -39,18 +39,18 @@ public:
virtual void SetValue(bool val);
virtual bool GetValue() const ;
// implementation
// implementation
void Command(wxCommandEvent& event);
wxRadioButton *AddInCycle(wxRadioButton *cycle);
void RemoveFromCycle();
inline wxRadioButton *NextInCycle() {return m_cycle;}
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:
wxRadioButton *m_cycle;
};

2
include/wx/osx/slider.h
View File

@@ -76,7 +76,7 @@ public:
void Command(wxCommandEvent& event);
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;

2
include/wx/osx/sound.h
View File

@@ -32,7 +32,7 @@ public:
static bool IsPlaying();
void* GetHandle();
protected:
protected:
bool DoPlay(unsigned flags) const;
private:

4
include/wx/osx/spinbutt.h
View File

@@ -57,11 +57,11 @@ public:
virtual void SetValue(int val);
// implementation
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
protected:

2
include/wx/osx/srchctrl.h
View File

@@ -69,7 +69,7 @@ protected:
void Init();
wxMenu *m_menu;
wxString m_descriptiveText;
private:

2
include/wx/osx/statbox.h
View File

@@ -44,7 +44,7 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
virtual bool AcceptsFocus() const { return false; }
// protect native font of box

6
include/wx/osx/taskbarosx.h
View File

@@ -26,8 +26,8 @@ public:
#if wxOSX_USE_COCOA
, CUSTOM_STATUSITEM
#endif
// , STATUSITEM
// , MENUEXTRA
// , STATUSITEM
// , MENUEXTRA
, DEFAULT_TYPE = DOCK
};
@@ -42,7 +42,7 @@ public:
bool PopupMenu(wxMenu *menu);
protected:
class wxTaskBarIconImpl* m_impl;
class wxTaskBarIconImpl* m_impl;
friend class wxTaskBarIconImpl;
};
#endif

4
include/wx/osx/textctrl.h
View File

@@ -185,10 +185,10 @@ protected:
unsigned long m_maxLength;
virtual void EnableTextChangedEvents(bool enable)
{
{
m_triggerUpdateEvents = enable;
}
bool m_triggerUpdateEvents ;
private :

2
include/wx/osx/tglbtn.h
View File

@@ -53,7 +53,7 @@ private:
int m_marginX,
m_marginY;
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const;

6
include/wx/osx/toplevel.h
View File

@@ -44,12 +44,12 @@ public:
const wxString& name = wxFrameNameStr);
virtual ~wxTopLevelWindowMac();
virtual bool Destroy();
virtual wxPoint GetClientAreaOrigin() const;
virtual bool SetShape(const wxRegion& region)
virtual bool SetShape(const wxRegion& region)
{ return DoSetShape(region); }
// Attracts the users attention to this window if the application is
@@ -71,7 +71,7 @@ public:
virtual void SetTitle( const wxString& title);
virtual wxString GetTitle() const;
protected:
// common part of all ctors
void Init();

6
include/wx/osx/window.h
View File

@@ -156,7 +156,7 @@ public:
// this should not be overriden in classes above wxWindowMac
// because it is called from its destructor via DeleteChildren
virtual void RemoveChild( wxWindowBase *child );
virtual bool MacDoRedraw( long time ) ;
virtual void MacPaintChildrenBorders();
virtual void MacPaintBorders( int left , int top ) ;
@@ -235,12 +235,12 @@ public:
// the 'true' OS level control for this wxWindow
wxOSXWidgetImpl* GetPeer() const { return m_peer ; }
void * MacGetCGContextRef() { return m_cgContextRef ; }
void MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
virtual bool OSXHandleKeyEvent( wxKeyEvent& event );
protected: