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/anidecod.h
View File

@@ -44,7 +44,7 @@ public:
virtual wxColour GetTransparentColour(unsigned int frame) const; virtual wxColour GetTransparentColour(unsigned int frame) const;
// implementation of wxAnimationDecoder's pure virtuals // implementation of wxAnimationDecoder's pure virtuals
virtual bool Load( wxInputStream& stream ); virtual bool Load( wxInputStream& stream );
bool ConvertToImage(unsigned int frame, wxImage *image) const; bool ConvertToImage(unsigned int frame, wxImage *image) const;
@@ -58,7 +58,7 @@ private:
// wxAnimationDecoder pure virtual: // wxAnimationDecoder pure virtual:
virtual bool DoCanRead( wxInputStream& stream ) const; virtual bool DoCanRead( wxInputStream& stream ) const;
// modifies current stream position (see wxAnimationDecoder::CanRead) // modifies current stream position (see wxAnimationDecoder::CanRead)
// frames stored as wxImage(s): ANI files are meant to be used mostly for animated // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
// cursors and thus they do not use any optimization to encode differences between // cursors and thus they do not use any optimization to encode differences between
// two frames: they are just a list of images to display sequentially. // two frames: they are just a list of images to display sequentially.

6
include/wx/animdecod.h
View File

@@ -95,11 +95,11 @@ public:
} }
virtual bool Load( wxInputStream& stream ) = 0; virtual bool Load( wxInputStream& stream ) = 0;
bool CanRead( wxInputStream& stream ) const bool CanRead( wxInputStream& stream ) const
{ {
// NOTE: this code is the same of wxImageHandler::CallDoCanRead // NOTE: this code is the same of wxImageHandler::CallDoCanRead
if ( !stream.IsSeekable() ) if ( !stream.IsSeekable() )
return false; // can't test unseekable stream return false; // can't test unseekable stream
@@ -157,7 +157,7 @@ protected:
// this function should modify the stream current position without taking care // this function should modify the stream current position without taking care
// of restoring it since CanRead() will do it. // of restoring it since CanRead() will do it.
virtual bool DoCanRead(wxInputStream& stream) const = 0; virtual bool DoCanRead(wxInputStream& stream) const = 0;
wxSize m_szAnimation; wxSize m_szAnimation;
unsigned int m_nFrames; unsigned int m_nFrames;

8
include/wx/aui/floatpane.h
View File

@@ -37,18 +37,18 @@ public:
const wxAuiPaneInfo& pane, const wxAuiPaneInfo& pane,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT |
wxCLIP_CHILDREN wxCLIP_CHILDREN
); );
virtual ~wxAuiFloatingFrame(); virtual ~wxAuiFloatingFrame();
void SetPaneWindow(const wxAuiPaneInfo& pane); void SetPaneWindow(const wxAuiPaneInfo& pane);
wxAuiManager* GetOwnerManager() const; wxAuiManager* GetOwnerManager() const;
protected: protected:
virtual void OnMoveStart(); virtual void OnMoveStart();
virtual void OnMoving(const wxRect& window_rect, wxDirection dir); virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
virtual void OnMoveFinished(); virtual void OnMoveFinished();
private: private:
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
@@ -56,7 +56,7 @@ private:
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
static bool isMouseDown(); static bool isMouseDown();
private: private:
wxWindow* m_pane_window; // pane window being managed wxWindow* m_pane_window; // pane window being managed
bool m_solid_drag; // true if system uses solid window drag bool m_solid_drag; // true if system uses solid window drag

4
include/wx/cairo.h
View File

@@ -43,13 +43,13 @@ private:
wxCairoLibrary(); wxCairoLibrary();
~wxCairoLibrary(); ~wxCairoLibrary();
bool IsOk(); bool IsOk();
bool InitializeMethods(); bool InitializeMethods();
wxDynamicLibrary m_libCairo; wxDynamicLibrary m_libCairo;
wxDynamicLibrary m_libPangoCairo; wxDynamicLibrary m_libPangoCairo;
// true if we successfully loaded the libraries and can use them // true if we successfully loaded the libraries and can use them
// //
// note that this field must have this name as it's used by wxDL_XXX macros // note that this field must have this name as it's used by wxDL_XXX macros

2
include/wx/cocoa/NSSlider.h
View File

@@ -21,7 +21,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSlider);
WX_DECLARE_OBJC_HASHMAP(NSSlider); WX_DECLARE_OBJC_HASHMAP(NSSlider);
// For when we're not in Objective-C mode: // For when we're not in Objective-C mode:
typedef struct objc_selector *SEL; typedef struct objc_selector *SEL;
class wxCocoaNSSliderLastSelectorChanger; class wxCocoaNSSliderLastSelectorChanger;

6
include/wx/cocoa/ObjcRef.h
View File

@@ -2,7 +2,7 @@
// Name: wx/cocoa/ObjcRef.h // Name: wx/cocoa/ObjcRef.h
// Purpose: wxObjcAutoRef template class // Purpose: wxObjcAutoRef template class
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2004/03/28 // Created: 2004/03/28
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott <dfe@cox.net> // Copyright: (c) 2004 David Elliott <dfe@cox.net>
@@ -47,7 +47,7 @@
wxGCSafeRelease(m_obj); // release current object (if any) wxGCSafeRelease(m_obj); // release current object (if any)
m_obj = wxGCSafeRetain([[NSObject alloc] init]); m_obj = wxGCSafeRetain([[NSObject alloc] init]);
[m_obj release]; // balance alloc [m_obj release]; // balance alloc
Consider the effect on the retain count from each statement (alloc, CFRetain, release) Consider the effect on the retain count from each statement (alloc, CFRetain, release)
In RR mode: retainCount = 1, +1, -1 In RR mode: retainCount = 1, +1, -1
In GC mode: strongRetainCount = 0, +1, -0 In GC mode: strongRetainCount = 0, +1, -0
@@ -150,7 +150,7 @@ protected:
it will use a method (currently CFRetain/CFRelease) to ensure the object will never be it will use a method (currently CFRetain/CFRelease) to ensure the object will never be
finalized until this object is destroyed. finalized until this object is destroyed.
*/ */
template <class T> template <class T>
class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase
{ {

2
include/wx/cocoa/autorelease.h
View File

@@ -2,7 +2,7 @@
// Name: wx/cocoa/autorelease.h // Name: wx/cocoa/autorelease.h
// Purpose: Automatic NSAutoreleasePool functionality // Purpose: Automatic NSAutoreleasePool functionality
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/07/11 // Created: 2003/07/11
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott <dfe@cox.net> // Copyright: (c) 2003 David Elliott <dfe@cox.net>

2
include/wx/cocoa/dirdlg.h
View File

@@ -34,7 +34,7 @@ public:
virtual ~wxDirDialog(); virtual ~wxDirDialog();
virtual int ShowModal(); virtual int ShowModal();
inline WX_NSSavePanel GetNSSavePanel() inline WX_NSSavePanel GetNSSavePanel()
{ return (WX_NSSavePanel)m_cocoaNSWindow; } { return (WX_NSSavePanel)m_cocoaNSWindow; }

2
include/wx/cocoa/filedlg.h
View File

@@ -40,7 +40,7 @@ public:
virtual void GetFilenames(wxArrayString& files) const; virtual void GetFilenames(wxArrayString& files) const;
virtual int ShowModal(); virtual int ShowModal();
inline WX_NSSavePanel GetNSSavePanel() inline WX_NSSavePanel GetNSSavePanel()
{ return (WX_NSSavePanel)m_cocoaNSWindow; } { return (WX_NSSavePanel)m_cocoaNSWindow; }

4
include/wx/cocoa/font.h
View File

@@ -62,7 +62,7 @@ public:
{ {
(void)Create(size, family, style, weight, underlined, face, encoding); (void)Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -74,7 +74,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
/*! @abstract Construction with opaque wxNativeFontInfo /*! @abstract Construction with opaque wxNativeFontInfo
*/ */
wxFont(const wxNativeFontInfo& info) wxFont(const wxNativeFontInfo& info)

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

@@ -92,7 +92,7 @@ public:
// these methods get/set the length of the slider pointer in pixels // these methods get/set the length of the slider pointer in pixels
virtual void SetThumbLength(int lenPixels); virtual void SetThumbLength(int lenPixels);
virtual int GetThumbLength() const; virtual int GetThumbLength() const;
// copied from (wxSliderCocoa.h) // copied from (wxSliderCocoa.h)
virtual void SetTickFreq(int n, int pos); virtual void SetTickFreq(int n, int pos);
virtual int GetTickFreq() const; virtual int GetTickFreq() const;

4
include/wx/cocoa/sound.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxSound class (loads and plays short Windows .wav files). // Purpose: wxSound class (loads and plays short Windows .wav files).
// Optional on non-Windows platforms. // Optional on non-Windows platforms.
// Authors: David Elliott, Ryan Norton // Authors: David Elliott, Ryan Norton
// Modified by: // Modified by:
// Created: 2004-10-02 // Created: 2004-10-02
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott, Ryan Norton // Copyright: (c) 2004 David Elliott, Ryan Norton
@@ -41,7 +41,7 @@ public:
void SetNSSound(WX_NSSound cocoaNSSound); void SetNSSound(WX_NSSound cocoaNSSound);
inline WX_NSSound GetNSSound() inline WX_NSSound GetNSSound()
{ return m_cocoaNSSound; } { return m_cocoaNSSound; }
protected: protected:
bool DoPlay(unsigned flags) const; bool DoPlay(unsigned flags) const;
bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
private: private:

2
include/wx/cocoa/tooltip.h
View File

@@ -48,7 +48,7 @@ private:
wxString m_text; // tooltip text wxString m_text; // tooltip text
wxWindow *m_window; // window we're associated with wxWindow *m_window; // window we're associated with
DECLARE_ABSTRACT_CLASS(wxToolTip) DECLARE_ABSTRACT_CLASS(wxToolTip)
}; };

2
include/wx/combo.h
View File

@@ -617,7 +617,7 @@ protected:
// should the focus be reset to the textctrl in idle time? // should the focus be reset to the textctrl in idle time?
bool m_resetFocus; bool m_resetFocus;
private: private:
void Init(); void Init();

2
include/wx/confbase.h
View File

@@ -217,7 +217,7 @@ public:
} }
#endif // wxHAS_CONFIG_TEMPLATE_RW #endif // wxHAS_CONFIG_TEMPLATE_RW
// convenience functions returning directly the value // convenience functions returning directly the value
wxString Read(const wxString& key, wxString Read(const wxString& key,
const wxString& defVal = wxEmptyString) const const wxString& defVal = wxEmptyString) const
{ wxString s; (void)Read(key, &s, defVal); return s; } { wxString s; (void)Read(key, &s, defVal); return s; }

2
include/wx/dataobj.h
View File

@@ -515,7 +515,7 @@ private:
#include "wx/gtk/dataobj2.h" #include "wx/gtk/dataobj2.h"
// wxURLDataObject defined in msw/ole/dataobj2.h // wxURLDataObject defined in msw/ole/dataobj2.h
#else #else
#if defined(__WXGTK__) #if defined(__WXGTK__)
#include "wx/gtk1/dataobj2.h" #include "wx/gtk1/dataobj2.h"
#elif defined(__WXX11__) #elif defined(__WXX11__)

2
include/wx/datstrm.h
View File

@@ -78,7 +78,7 @@ public:
wxDataInputStream& operator>>(float& f); wxDataInputStream& operator>>(float& f);
void BigEndianOrdered(bool be_order) { m_be_order = be_order; } void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
#if wxUSE_UNICODE #if wxUSE_UNICODE
void SetConv( const wxMBConv &conv ); void SetConv( const wxMBConv &conv );
wxMBConv *GetConv() const { return m_conv; } wxMBConv *GetConv() const { return m_conv; }

14
include/wx/dcgraph.h
View File

@@ -31,10 +31,10 @@ public:
#endif #endif
wxGCDC(); wxGCDC();
virtual ~wxGCDC(); virtual ~wxGCDC();
wxGraphicsContext* GetGraphicsContext(); wxGraphicsContext* GetGraphicsContext();
void SetGraphicsContext( wxGraphicsContext* ctx ); void SetGraphicsContext( wxGraphicsContext* ctx );
DECLARE_DYNAMIC_CLASS(wxGCDC) DECLARE_DYNAMIC_CLASS(wxGCDC)
wxDECLARE_NO_COPY_CLASS(wxGCDC); wxDECLARE_NO_COPY_CLASS(wxGCDC);
}; };
@@ -49,7 +49,7 @@ public:
wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
#endif #endif
wxGCDCImpl( wxDC *owner ); wxGCDCImpl( wxDC *owner );
virtual ~wxGCDCImpl(); virtual ~wxGCDCImpl();
void Init(); void Init();
@@ -65,7 +65,7 @@ public:
virtual void StartPage(); virtual void StartPage();
virtual void EndPage(); virtual void EndPage();
// flushing the content of this dc immediately onto screen // flushing the content of this dc immediately onto screen
virtual void Flush(); virtual void Flush();
@@ -97,7 +97,7 @@ public:
wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
virtual void SetGraphicsContext( wxGraphicsContext* ctx ); virtual void SetGraphicsContext( wxGraphicsContext* ctx );
// the true implementations // the true implementations
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style = wxFLOOD_SURFACE); wxFloodFillStyle style = wxFLOOD_SURFACE);
@@ -150,7 +150,7 @@ public:
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
@@ -195,7 +195,7 @@ protected:
double m_formerScaleX, m_formerScaleY; double m_formerScaleX, m_formerScaleY;
wxGraphicsContext* m_graphicContext; wxGraphicsContext* m_graphicContext;
DECLARE_CLASS(wxGCDCImpl) DECLARE_CLASS(wxGCDCImpl)
wxDECLARE_NO_COPY_CLASS(wxGCDCImpl); wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
}; };

6
include/wx/dcmemory.h
View File

@@ -25,13 +25,13 @@ public:
wxMemoryDC(); wxMemoryDC();
wxMemoryDC( wxBitmap& bitmap ); wxMemoryDC( wxBitmap& bitmap );
wxMemoryDC( wxDC *dc ); wxMemoryDC( wxDC *dc );
// select the given bitmap to draw on it // select the given bitmap to draw on it
void SelectObject(wxBitmap& bmp); void SelectObject(wxBitmap& bmp);
// select the given bitmap for read-only // select the given bitmap for read-only
void SelectObjectAsSource(const wxBitmap& bmp); void SelectObjectAsSource(const wxBitmap& bmp);
// get selected bitmap // get selected bitmap
const wxBitmap& GetSelectedBitmap() const; const wxBitmap& GetSelectedBitmap() const;
wxBitmap& GetSelectedBitmap(); wxBitmap& GetSelectedBitmap();
@@ -39,7 +39,7 @@ public:
private: private:
DECLARE_DYNAMIC_CLASS(wxMemoryDC) DECLARE_DYNAMIC_CLASS(wxMemoryDC)
}; };
#endif #endif
// _WX_DCMEMORY_H_BASE_ // _WX_DCMEMORY_H_BASE_

2
include/wx/dcmirror.h
View File

@@ -202,7 +202,7 @@ protected:
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord w, wxCoord h, wxCoord w, wxCoord h,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, wxRasterOperationMode rop = wxCOPY,
bool useMask = false, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
{ {

2
include/wx/dcscreen.h
View File

@@ -24,7 +24,7 @@ public:
{ return true; } { return true; }
static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) = NULL) static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) = NULL)
{ return true; } { return true; }
static bool EndDrawingOnTop() static bool EndDrawingOnTop()
{ return true; } { return true; }
private: private:

12
include/wx/dcsvg.h
View File

@@ -33,11 +33,11 @@ class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
{ {
public: public:
wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
int width=320, int height=240, double dpi=72.0 ); int width=320, int height=240, double dpi=72.0 );
virtual ~wxSVGFileDCImpl(); virtual ~wxSVGFileDCImpl();
bool IsOk() const { return m_OK; } bool IsOk() const { return m_OK; }
virtual bool CanDrawBitmap() const { return true; } virtual bool CanDrawBitmap() const { return true; }
@@ -132,7 +132,7 @@ private:
virtual void DoDrawPoint(wxCoord, wxCoord); virtual void DoDrawPoint(wxCoord, wxCoord);
virtual void DoDrawPolygon(int n, wxPoint points[], virtual void DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset, wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle); wxPolygonFillMode fillStyle);
@@ -179,7 +179,7 @@ private:
} }
virtual void DoGetSizeMM( int *width, int *height ) const; virtual void DoGetSizeMM( int *width, int *height ) const;
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const;
void Init (const wxString &filename, int width, int height, double dpi); void Init (const wxString &filename, int width, int height, double dpi);
@@ -205,12 +205,12 @@ private:
class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
{ {
public: public:
wxSVGFileDC(const wxString& filename, wxSVGFileDC(const wxString& filename,
int width = 320, int width = 320,
int height = 240, int height = 240,
double dpi = 72.0) double dpi = 72.0)
: wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi)) : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))
{ {
} }
}; };

4
include/wx/dfb/font.h
View File

@@ -47,7 +47,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -59,7 +59,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

10
include/wx/dialog.h
View File

@@ -55,9 +55,9 @@ enum wxDialogLayoutAdaptationMode
enum wxDialogModality enum wxDialogModality
{ {
wxDIALOG_MODALITY_NONE = 0, wxDIALOG_MODALITY_NONE = 0,
wxDIALOG_MODALITY_WINDOW_MODAL = 1, wxDIALOG_MODALITY_WINDOW_MODAL = 1,
wxDIALOG_MODALITY_APP_MODAL = 2 wxDIALOG_MODALITY_APP_MODAL = 2
}; };
extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
@@ -342,8 +342,8 @@ public:
wxDialog *GetDialog() const wxDialog *GetDialog() const
{ return wxStaticCast(GetEventObject(), wxDialog); } { return wxStaticCast(GetEventObject(), wxDialog); }
int GetReturnCode() const int GetReturnCode() const
{ return GetDialog()->GetReturnCode(); } { return GetDialog()->GetReturnCode(); }
virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); } virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }

4
include/wx/font.h
View File

@@ -113,7 +113,7 @@ class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
public: public:
/* /*
derived classes should provide the following ctors: derived classes should provide the following ctors:
wxFont(); wxFont();
wxFont(const wxString& nativeFontInfoString); wxFont(const wxString& nativeFontInfoString);
wxFont(const wxNativeFontInfo& info); wxFont(const wxNativeFontInfo& info);
@@ -132,7 +132,7 @@ public:
const wxString& face = wxEmptyString, const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
*/ */
// creator function // creator function
virtual ~wxFontBase(); virtual ~wxFontBase();

2
include/wx/fontutil.h
View File

@@ -152,7 +152,7 @@ public:
void Free(); void Free();
void EnsureValid(); void EnsureValid();
bool m_descriptorValid; bool m_descriptorValid;
#if wxOSX_USE_CORE_TEXT #if wxOSX_USE_CORE_TEXT
CTFontDescriptorRef m_ctFontDescriptor; CTFontDescriptorRef m_ctFontDescriptor;

12
include/wx/generic/dataview.h
View File

@@ -135,7 +135,7 @@ public:
// in-place editing // in-place editing
virtual bool HasEditorCtrl() const; virtual bool HasEditorCtrl() const;
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
const wxVariant &value ); const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
@@ -260,7 +260,7 @@ public:
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
virtual bool HasEditorCtrl() const { return true; } virtual bool HasEditorCtrl() const { return true; }
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
const wxVariant &value ); const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
@@ -288,8 +288,8 @@ public:
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
virtual bool Activate( wxRect cell, virtual bool Activate( wxRect cell,
wxDataViewModel *model, wxDataViewModel *model,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned int col ); unsigned int col );
private: private:
@@ -445,9 +445,9 @@ public:
virtual void EnsureVisible( const wxDataViewItem & item, virtual void EnsureVisible( const wxDataViewItem & item,
const wxDataViewColumn *column = NULL ); const wxDataViewColumn *column = NULL );
virtual void HitTest( const wxPoint & point, wxDataViewItem & item, virtual void HitTest( const wxPoint & point, wxDataViewItem & item,
wxDataViewColumn* &column ) const; wxDataViewColumn* &column ) const;
virtual wxRect GetItemRect( const wxDataViewItem & item, virtual wxRect GetItemRect( const wxDataViewItem & item,
const wxDataViewColumn *column = NULL ) const; const wxDataViewColumn *column = NULL ) const;
virtual void Expand( const wxDataViewItem & item ); virtual void Expand( const wxDataViewItem & item );

12
include/wx/generic/dcpsg.h
View File

@@ -95,7 +95,7 @@ public:
virtual wxRect GetPaperRect() const; virtual wxRect GetPaperRect() const;
protected: protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
wxFloodFillStyle style = wxFLOOD_SURFACE); wxFloodFillStyle style = wxFLOOD_SURFACE);
bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
@@ -104,11 +104,11 @@ protected:
void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea); void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
void DoDrawPoint(wxCoord x, wxCoord y); void DoDrawPoint(wxCoord x, wxCoord y);
void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
void DoDrawPolygon(int n, wxPoint points[], void DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset = 0, wxCoord yoffset = 0, wxCoord xoffset = 0, wxCoord yoffset = 0,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
void DoDrawPolyPolygon(int n, int count[], wxPoint points[], void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
wxCoord xoffset = 0, wxCoord yoffset = 0, wxCoord xoffset = 0, wxCoord yoffset = 0,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
@@ -117,7 +117,7 @@ protected:
void DoDrawSpline(const wxPointList *points); void DoDrawSpline(const wxPointList *points);
#endif #endif
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);

8
include/wx/generic/statbmpg.h
View File

@@ -45,9 +45,9 @@ public:
virtual wxBitmap GetBitmap() const { return m_bitmap; } virtual wxBitmap GetBitmap() const { return m_bitmap; }
virtual void SetIcon(const wxIcon& icon) virtual void SetIcon(const wxIcon& icon)
{ {
m_bitmap.CopyFromIcon(icon); m_bitmap.CopyFromIcon(icon);
SetInitialSize(GetBitmapSize()); SetInitialSize(GetBitmapSize());
Refresh(); Refresh();
} }
@@ -59,7 +59,7 @@ public:
private: private:
wxSize GetBitmapSize() wxSize GetBitmapSize()
{ {
return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
: wxSize(16, 16); // this is completely arbitrary : wxSize(16, 16); // this is completely arbitrary

10
include/wx/generic/treectlg.h
View File

@@ -258,12 +258,12 @@ protected:
wxCursor m_oldCursor; // cursor is changed while dragging wxCursor m_oldCursor; // cursor is changed while dragging
wxGenericTreeItem *m_oldSelection; wxGenericTreeItem *m_oldSelection;
wxGenericTreeItem *m_underMouse; // for visual effects wxGenericTreeItem *m_underMouse; // for visual effects
enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect; enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
wxGenericTreeItem *m_dndEffectItem; wxGenericTreeItem *m_dndEffectItem;
wxTreeTextCtrl *m_textCtrl; wxTreeTextCtrl *m_textCtrl;
wxTimer *m_renameTimer; wxTimer *m_renameTimer;
@@ -276,7 +276,7 @@ protected:
// the common part of all ctors // the common part of all ctors
void Init(); void Init();
// overridden wxWindow methods // overridden wxWindow methods
virtual void DoThaw(); virtual void DoThaw();
// misc helpers // misc helpers

2
include/wx/gifdecod.h
View File

@@ -95,7 +95,7 @@ private:
wxGIFErrorCode dgif(wxInputStream& stream, wxGIFErrorCode dgif(wxInputStream& stream,
GIFImage *img, int interl, int bits); GIFImage *img, int interl, int bits);
// array of all frames // array of all frames
wxArrayPtrVoid m_frames; wxArrayPtrVoid m_frames;

2
include/wx/glcanvas.h
View File

@@ -118,7 +118,7 @@ public:
// miscellaneous helper functions // miscellaneous helper functions
// ------------------------------ // ------------------------------
#ifndef wxHAS_OPENGL_ES #ifndef wxHAS_OPENGL_ES
// call glcolor() for the colour with the given name, return false if // call glcolor() for the colour with the given name, return false if
// colour not found // colour not found
bool SetColour(const wxString& colour); bool SetColour(const wxString& colour);

12
include/wx/graphics.h
View File

@@ -30,10 +30,10 @@ enum wxCompositionMode
{ {
// R = Result, S = Source, D = Destination, premultiplied with alpha // R = Result, S = Source, D = Destination, premultiplied with alpha
// Ra, Sa, Da their alpha components // Ra, Sa, Da their alpha components
// classic Porter-Duff compositions // classic Porter-Duff compositions
// http://keithp.com/~keithp/porterduff/p253-porter.pdf // http://keithp.com/~keithp/porterduff/p253-porter.pdf
wxCOMPOSITION_CLEAR, /* R = 0 */ wxCOMPOSITION_CLEAR, /* R = 0 */
wxCOMPOSITION_SOURCE, /* R = S */ wxCOMPOSITION_SOURCE, /* R = S */
wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */
@@ -47,7 +47,7 @@ enum wxCompositionMode
wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */ wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */
wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */ wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */
wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */
// mathematical compositions // mathematical compositions
wxCOMPOSITION_ADD, /* R = S + D */ wxCOMPOSITION_ADD, /* R = S + D */
}; };
@@ -390,13 +390,13 @@ public:
// returns the current shape antialiasing mode // returns the current shape antialiasing mode
virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; } virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; }
// sets the antialiasing mode, returns true if it supported // sets the antialiasing mode, returns true if it supported
virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0; virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0;
// returns the current compositing operator // returns the current compositing operator
virtual wxCompositionMode GetCompositionMode() const { return m_composition; } virtual wxCompositionMode GetCompositionMode() const { return m_composition; }
// sets the compositing operator, returns true if it supported // sets the compositing operator, returns true if it supported
virtual bool SetCompositionMode(wxCompositionMode op) = 0; virtual bool SetCompositionMode(wxCompositionMode op) = 0;
@@ -417,7 +417,7 @@ public:
// all rendering is done into a fully transparent temporary context // all rendering is done into a fully transparent temporary context
virtual void BeginLayer(wxDouble opacity) = 0; virtual void BeginLayer(wxDouble opacity) = 0;
// composites back the drawings into the context with the opacity given at // composites back the drawings into the context with the opacity given at
// the BeginLayer call // the BeginLayer call
virtual void EndLayer() = 0; virtual void EndLayer() = 0;

4
include/wx/gtk/bitmap.h
View File

@@ -51,9 +51,9 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{ {
public: public:
wxBitmap() { } wxBitmap() { }
wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH )
{ Create(width, height, depth); } { Create(width, height, depth); }
wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH )
{ Create(sz, depth); } { Create(sz, depth); }
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits ); wxBitmap( const char* const* bits );

8
include/wx/gtk/dcclient.h
View File

@@ -32,7 +32,7 @@ public:
virtual bool CanGetTextExtent() const { return true; } virtual bool CanGetTextExtent() const { return true; }
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const;
virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style=wxFLOOD_SURFACE ); wxFloodFillStyle style=wxFLOOD_SURFACE );
virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
@@ -58,11 +58,11 @@ public:
virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
bool useMask = false ); bool useMask = false );
virtual bool DoBlit( wxCoord xdest, wxCoord ydest, virtual bool DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode logical_func = wxCOPY, wxRasterOperationMode logical_func = wxCOPY,
bool useMask = false, bool useMask = false,
wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );

6
include/wx/gtk/dcmemory.h
View File

@@ -23,7 +23,7 @@ public:
wxMemoryDCImpl( wxMemoryDC *owner ); wxMemoryDCImpl( wxMemoryDC *owner );
wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
virtual ~wxMemoryDCImpl(); virtual ~wxMemoryDCImpl();
// these get reimplemented for mono-bitmaps to behave // these get reimplemented for mono-bitmaps to behave
@@ -48,12 +48,12 @@ public:
private: private:
wxBitmap m_selected; wxBitmap m_selected;
void Init(); void Init();
DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl) DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
}; };
#endif #endif
// _WX_GTK_DCMEMORY_H_ // _WX_GTK_DCMEMORY_H_

2
include/wx/gtk/evtloop.h
View File

@@ -32,7 +32,7 @@ public:
void StoreGdkEventForLaterProcessing(GdkEvent* ev) void StoreGdkEventForLaterProcessing(GdkEvent* ev)
{ m_arrGdkEvents.Add(ev); } { m_arrGdkEvents.Add(ev); }
protected: protected:
// the exit code of this event loop // the exit code of this event loop

2
include/wx/gtk/filectrl.h
View File

@@ -55,7 +55,7 @@ private:
GtkFileChooser *m_widget; GtkFileChooser *m_widget;
// First wildcard in filter, to be used when the user // First wildcard in filter, to be used when the user
// saves a file without giving an extension. // saves a file without giving an extension.
wxArrayString m_wildcards; wxArrayString m_wildcards;
}; };
#if wxUSE_FILECTRL #if wxUSE_FILECTRL

2
include/wx/gtk/font.h
View File

@@ -62,7 +62,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

4
include/wx/gtk/gnome/gprint.h
View File

@@ -250,7 +250,7 @@ public:
void SetPalette(const wxPalette& WXUNUSED(palette)) { } void SetPalette(const wxPalette& WXUNUSED(palette)) { }
protected: protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
wxFloodFillStyle style=wxFLOOD_SURFACE ); wxFloodFillStyle style=wxFLOOD_SURFACE );
bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
@@ -268,7 +268,7 @@ protected:
void DoDrawSpline(const wxPointList *points); void DoDrawSpline(const wxPointList *points);
#endif #endif
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode = wxCOPY, bool useMask = false, wxRasterOperationMode = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

2
include/wx/gtk/gnome/gvfs.h
View File

@@ -48,6 +48,6 @@ public:
}; };
#endif #endif
// wxUSE_MIMETYPE // wxUSE_MIMETYPE
#endif #endif

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

@@ -26,7 +26,7 @@ public:
bool Create(wxWindow *parent, int flags = wxBORDER_NONE); bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual bool Show(bool show = true); virtual bool Show(bool show = true);
virtual void SetFocus(); virtual void SetFocus();
// implementation // implementation

4
include/wx/gtk/print.h
View File

@@ -255,7 +255,7 @@ public:
virtual wxRect GetPaperRect() const; virtual wxRect GetPaperRect() const;
protected: protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
wxFloodFillStyle style=wxFLOOD_SURFACE ); wxFloodFillStyle style=wxFLOOD_SURFACE );
void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter); void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter);
void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST); void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST);
@@ -275,7 +275,7 @@ protected:
void DoDrawSpline(const wxPointList *points); void DoDrawSpline(const wxPointList *points);
#endif #endif
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

2
include/wx/gtk/region.h
View File

@@ -35,7 +35,7 @@ public:
InitRect(rect.x, rect.y, rect.width, rect.height); InitRect(rect.x, rect.y, rect.width, rect.height);
} }
wxRegion( size_t n, const wxPoint *points, wxRegion( size_t n, const wxPoint *points,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
#if wxUSE_IMAGE #if wxUSE_IMAGE

2
include/wx/gtk/scrolbar.h
View File

@@ -56,7 +56,7 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected: protected:
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

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

@@ -44,7 +44,7 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
virtual bool Enable( bool enable = true ); virtual bool Enable( bool enable = true );
// implementation // implementation
@@ -55,7 +55,7 @@ public:
protected: protected:
void GtkDisableEvents() const; void GtkDisableEvents() const;
void GtkEnableEvents() const; void GtkEnableEvents() const;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

2
include/wx/gtk/statbmp.h
View File

@@ -49,7 +49,7 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private: private:
wxBitmap m_bitmap; wxBitmap m_bitmap;

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

@@ -51,7 +51,7 @@ protected:
virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
void DoApplyWidgetStyle(GtkRcStyle *style); void DoApplyWidgetStyle(GtkRcStyle *style);
private: private:
DECLARE_DYNAMIC_CLASS(wxStaticBox) DECLARE_DYNAMIC_CLASS(wxStaticBox)
}; };

2
include/wx/gtk/treeentry_gtk.h
View File

@@ -65,7 +65,7 @@ WXDLLIMPEXP_CORE
void gtk_tree_entry_set_userdata (GtkTreeEntry* entry, gpointer userdata); void gtk_tree_entry_set_userdata (GtkTreeEntry* entry, gpointer userdata);
WXDLLIMPEXP_CORE WXDLLIMPEXP_CORE
void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry, void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry,
GtkTreeEntryDestroy destroy_func, GtkTreeEntryDestroy destroy_func,
gpointer destroy_func_data); gpointer destroy_func_data);

4
include/wx/gtk1/font.h
View File

@@ -63,7 +63,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -75,7 +75,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

2
include/wx/imagbmp.h
View File

@@ -89,7 +89,7 @@ public:
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ); virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index );
protected: protected:
virtual int DoGetImageCount( wxInputStream& stream ); virtual int DoGetImageCount( wxInputStream& stream );
virtual bool DoCanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );

12
include/wx/image.h
View File

@@ -100,10 +100,10 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
// NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes
// to implement only one of the two // to implement only one of the two
virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream),
bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 ) bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 )
{ return false; } { return false; }
virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream),
bool WXUNUSED(verbose)=true ) bool WXUNUSED(verbose)=true )
{ return false; } { return false; }
@@ -135,9 +135,9 @@ protected:
#if wxUSE_STREAMS #if wxUSE_STREAMS
// NOTE: this function is allowed to change the current stream position // NOTE: this function is allowed to change the current stream position
// since GetImageCount() will take care of restoring it later // since GetImageCount() will take care of restoring it later
virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) ) virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) )
{ return 1; } // default return value is 1 image { return 1; } // default return value is 1 image
// NOTE: this function is allowed to change the current stream position // NOTE: this function is allowed to change the current stream position
// since CallDoCanRead() will take care of restoring it later // since CallDoCanRead() will take care of restoring it later
virtual bool DoCanRead( wxInputStream& stream ) = 0; virtual bool DoCanRead( wxInputStream& stream ) = 0;
@@ -275,7 +275,7 @@ public:
bool Create( int width, int height, bool clear = true ); bool Create( int width, int height, bool clear = true );
bool Create( int width, int height, unsigned char* data, bool static_data = false ); bool Create( int width, int height, unsigned char* data, bool static_data = false );
bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ); bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
// Create() variants using wxSize: // Create() variants using wxSize:
bool Create( const wxSize& sz, bool clear = true ) bool Create( const wxSize& sz, bool clear = true )
{ return Create(sz.GetWidth(), sz.GetHeight(), clear); } { return Create(sz.GetWidth(), sz.GetHeight(), clear); }
@@ -285,7 +285,7 @@ public:
{ return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); } { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); }
void Destroy(); void Destroy();
// initialize the image data with zeroes // initialize the image data with zeroes
void Clear(unsigned char value = 0); void Clear(unsigned char value = 0);

2
include/wx/log.h
View File

@@ -1307,7 +1307,7 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
wxDO_LOG(level) wxDO_LOG(level)
// wxLogFatalError() is special as it can't be disabled // wxLogFatalError() is special as it can't be disabled
#define wxLogFatalError wxDO_LOG(FatalError) #define wxLogFatalError wxDO_LOG(FatalError)
#define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr) #define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr)
#define wxLogError wxDO_LOG_IF_ENABLED(Error) #define wxLogError wxDO_LOG_IF_ENABLED(Error)

2
include/wx/menu.h
View File

@@ -499,7 +499,7 @@ public:
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
// get or change the label of the menu at given position // get or change the label of the menu at given position
// Deprecated in favour of SetMenuLabel // Deprecated in favour of SetMenuLabel
wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) ); wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );
// Deprecated in favour of GetMenuLabelText // Deprecated in favour of GetMenuLabelText
wxDEPRECATED( wxString GetLabelTop(size_t pos) const ); wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
#endif #endif

13
include/wx/meta/convertible.h
View File

@@ -17,8 +17,8 @@
template <class D, class B> template <class D, class B>
struct wxConvertibleTo_SizeHelper struct wxConvertibleTo_SizeHelper
{ {
static char Match(B* pb); static char Match(B* pb);
static int Match(...); static int Match(...);
}; };
// Helper to decide if an object of type D is convertible to type B (the test // Helper to decide if an object of type D is convertible to type B (the test
@@ -26,8 +26,13 @@ struct wxConvertibleTo_SizeHelper
template <class D, class B> template <class D, class B>
struct wxConvertibleTo struct wxConvertibleTo
{ {
enum { value = sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))==sizeof(char) enum
}; {
value =
sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))
==
sizeof(char)
};
}; };
#endif // _WX_META_CONVERTIBLE_H_ #endif // _WX_META_CONVERTIBLE_H_

2
include/wx/meta/if.h
View File

@@ -57,7 +57,7 @@ struct wxIfImpl<false>
} // namespace wxPrivate } // namespace wxPrivate
// wxIf<> template defines nested type "value" which is the same as // wxIf<> template defines nested type "value" which is the same as
// TTrue if the condition Cond (boolean compile-time constant) was met and // TTrue if the condition Cond (boolean compile-time constant) was met and
// TFalse if it wasn't. // TFalse if it wasn't.
// //

2
include/wx/meta/int2type.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/meta/int2type.h // Name: wx/meta/int2type.h
// Purpose: Generate a unique type from a constant integer // Purpose: Generate a unique type from a constant integer
// Author: Arne Steinarson // Author: Arne Steinarson
// Created: 2008-01-10 // Created: 2008-01-10
// RCS-ID: $Id$ // RCS-ID: $Id$

2
include/wx/mgl/dcmemory.h
View File

@@ -42,7 +42,7 @@ public:
// implementation // implementation
wxBitmap m_selected; wxBitmap m_selected;
wxBitmap GetSelectedObject() const { return m_selected; } wxBitmap GetSelectedObject() const { return m_selected; }
protected: protected:

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

@@ -31,7 +31,7 @@ public:
static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; } static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; } static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
static bool EndDrawingOnTop() { return TRUE; } static bool EndDrawingOnTop() { return TRUE; }
private: private:
DECLARE_DYNAMIC_CLASS(wxScreenDC) DECLARE_DYNAMIC_CLASS(wxScreenDC)
}; };

4
include/wx/mgl/font.h
View File

@@ -60,7 +60,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -72,7 +72,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

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

@@ -31,7 +31,7 @@ public:
(flags & wxBORDER_MASK) | wxPOPUP_WINDOW); (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
} }
protected: protected:
DECLARE_DYNAMIC_CLASS(wxPopupWindow) DECLARE_DYNAMIC_CLASS(wxPopupWindow)
}; };

2
include/wx/mimetype.h
View File

@@ -410,7 +410,7 @@ public:
static void Set( wxMimeTypesManagerFactory *factory ); static void Set( wxMimeTypesManagerFactory *factory );
static wxMimeTypesManagerFactory *Get(); static wxMimeTypesManagerFactory *Get();
private: private:
static wxMimeTypesManagerFactory *m_factory; static wxMimeTypesManagerFactory *m_factory;
}; };

4
include/wx/motif/font.h
View File

@@ -53,7 +53,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -65,7 +65,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

2
include/wx/msw/dc.h
View File

@@ -215,7 +215,7 @@ public:
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,

2
include/wx/msw/dcclient.h
View File

@@ -106,7 +106,7 @@ class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
{ {
public: public:
wxPaintDCEx(wxWindow *canvas, WXHDC dc); wxPaintDCEx(wxWindow *canvas, WXHDC dc);
DECLARE_CLASS(wxPaintDCEx) DECLARE_CLASS(wxPaintDCEx)
wxDECLARE_NO_COPY_CLASS(wxPaintDCEx); wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
}; };

2
include/wx/msw/dcmemory.h
View File

@@ -27,7 +27,7 @@ public:
virtual void DoGetSize(int* width, int* height) const; virtual void DoGetSize(int* width, int* height) const;
virtual void DoSelect(const wxBitmap& bitmap); virtual void DoSelect(const wxBitmap& bitmap);
virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );} { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
protected: protected:

2
include/wx/msw/font.h
View File

@@ -47,7 +47,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

18
include/wx/msw/printdlg.h
View File

@@ -30,18 +30,18 @@ class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
public: public:
wxWindowsPrintNativeData(); wxWindowsPrintNativeData();
virtual ~wxWindowsPrintNativeData(); virtual ~wxWindowsPrintNativeData();
virtual bool TransferTo( wxPrintData &data ); virtual bool TransferTo( wxPrintData &data );
virtual bool TransferFrom( const wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data );
virtual bool Ok() const { return IsOk(); } virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
void* GetDevMode() const { return m_devMode; } void* GetDevMode() const { return m_devMode; }
void SetDevMode(void* data) { m_devMode = data; } void SetDevMode(void* data) { m_devMode = data; }
void* GetDevNames() const { return m_devNames; } void* GetDevNames() const { return m_devNames; }
void SetDevNames(void* data) { m_devNames = data; } void SetDevNames(void* data) { m_devNames = data; }
private: private:
void* m_devMode; void* m_devMode;
void* m_devNames; void* m_devNames;
@@ -51,7 +51,7 @@ private:
private: private:
DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData) DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxWindowsPrintDialog: the MSW dialog for printing // wxWindowsPrintDialog: the MSW dialog for printing
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -76,11 +76,11 @@ private:
wxPrinterDC* m_printerDC; wxPrinterDC* m_printerDC;
bool m_destroyDC; bool m_destroyDC;
wxWindow* m_dialogParent; wxWindow* m_dialogParent;
private: private:
bool ConvertToNative( wxPrintDialogData &data ); bool ConvertToNative( wxPrintDialogData &data );
bool ConvertFromNative( wxPrintDialogData &data ); bool ConvertFromNative( wxPrintDialogData &data );
// holds MSW handle // holds MSW handle
void* m_printDlg; void* m_printDlg;
@@ -90,7 +90,7 @@ private:
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxWindowsPageSetupDialog: the MSW page setup dialog // wxWindowsPageSetupDialog: the MSW page setup dialog
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
@@ -110,7 +110,7 @@ public:
private: private:
wxPageSetupDialogData m_pageSetupData; wxPageSetupDialogData m_pageSetupData;
wxWindow* m_dialogParent; wxWindow* m_dialogParent;
// holds MSW handle // holds MSW handle
void* m_pageDlg; void* m_pageDlg;

2
include/wx/msw/spinctrl.h
View File

@@ -123,7 +123,7 @@ protected:
WXHWND m_hwndBuddy; WXHWND m_hwndBuddy;
WXFARPROC m_wndProcBuddy; WXFARPROC m_wndProcBuddy;
// Block text update event after SetValue() // Block text update event after SetValue()
bool m_blockEvent; bool m_blockEvent;
// all existing wxSpinCtrls - this allows to find the one corresponding to // all existing wxSpinCtrls - this allows to find the one corresponding to

2
include/wx/msw/textctrl.h
View File

@@ -108,7 +108,7 @@ public:
// Implementation from now on // Implementation from now on
// -------------------------- // --------------------------
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
virtual void SetDropTarget(wxDropTarget *dropTarget); virtual void SetDropTarget(wxDropTarget *dropTarget);
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT

4
include/wx/msw/tglbtn.h
View File

@@ -59,12 +59,12 @@ public:
protected: protected:
void Init(); void Init();
wxBitmap m_bitmap; wxBitmap m_bitmap;
wxBitmap m_disabledBitmap; wxBitmap m_disabledBitmap;
bool m_capturing; bool m_capturing;
bool m_depressed,m_oldValue; bool m_depressed,m_oldValue;
void OnPaint(wxPaintEvent &event); void OnPaint(wxPaintEvent &event);
void OnMouse(wxMouseEvent &event); void OnMouse(wxMouseEvent &event);
void OnChar(wxKeyEvent &event); void OnChar(wxKeyEvent &event);

4
include/wx/msw/tooltip.h
View File

@@ -23,10 +23,10 @@ public:
// ctor & dtor // ctor & dtor
wxToolTip(const wxString &tip); wxToolTip(const wxString &tip);
virtual ~wxToolTip(); virtual ~wxToolTip();
// ctor used by wxStatusBar to associate a tooltip to a portion of // ctor used by wxStatusBar to associate a tooltip to a portion of
// the status bar window: // the status bar window:
wxToolTip(wxWindow* win, unsigned int id, wxToolTip(wxWindow* win, unsigned int id,
const wxString &tip, const wxRect& rc); const wxString &tip, const wxRect& rc);
// accessors // accessors

4
include/wx/msw/window.h
View File

@@ -444,9 +444,9 @@ public:
// check if a native double-buffering applies for this window // check if a native double-buffering applies for this window
virtual bool IsDoubleBuffered() const; virtual bool IsDoubleBuffered() const;
void SetDoubleBuffered(bool on); void SetDoubleBuffered(bool on);
// synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
void GenerateMouseLeave(); void GenerateMouseLeave();

6
include/wx/msw/wrapwin.h
View File

@@ -72,10 +72,10 @@
// #undef the macros defined in winsows.h which conflict with code elsewhere // #undef the macros defined in winsows.h which conflict with code elsewhere
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability // Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability
// in the WINAPI SDK (they are an integral type that is the size of a // in the WINAPI SDK (they are an integral type that is the size of a
// pointer) on MSVC 7 and later. However, they are not available in older // pointer) on MSVC 7 and later. However, they are not available in older
// Platform SDKs, and since they are typedefs and not #defines we simply // Platform SDKs, and since they are typedefs and not #defines we simply
// overwrite them if there is a chance that they're not defined // overwrite them if there is a chance that they're not defined
#if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__) #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
#define UINT_PTR unsigned int #define UINT_PTR unsigned int

2
include/wx/os2/bitmap.h
View File

@@ -165,7 +165,7 @@ public:
); );
virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
{ return Create(sz.GetWidth(), sz.GetHeight(), depth); } { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
virtual bool Create( const void* pData virtual bool Create( const void* pData
,wxBitmapType lType ,wxBitmapType lType
,int nWidth ,int nWidth

2
include/wx/os2/dcmemory.h
View File

@@ -26,7 +26,7 @@ public:
virtual void DoGetSize(int* pWidth, int* pHeight) const; virtual void DoGetSize(int* pWidth, int* pHeight) const;
virtual void DoSelect(const wxBitmap& bitmap); virtual void DoSelect(const wxBitmap& bitmap);
virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);} { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
protected: protected:

4
include/wx/os2/font.h
View File

@@ -50,7 +50,7 @@ public:
{ {
Create(size, family, style, weight, underlined, face, encoding); Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxSize& pixelSize, wxFont(const wxSize& pixelSize,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,
@@ -62,7 +62,7 @@ public:
Create(10, family, style, weight, underlined, face, encoding); Create(10, family, style, weight, underlined, face, encoding);
SetPixelSize(pixelSize); SetPixelSize(pixelSize);
} }
bool Create(int size, bool Create(int size,
wxFontFamily family, wxFontFamily family,
wxFontStyle style, wxFontStyle style,

6
include/wx/os2/listctrl.h
View File

@@ -1,9 +1,9 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: wx/os2/listctrl.h // Name: wx/os2/listctrl.h
// Purpose: wxListCtrl class // Purpose: wxListCtrl class
// Author: // Author:
// Modified by: // Modified by:
// Created: // Created:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) wxWidgets team // Copyright: (c) wxWidgets team
// Licence: wxWindows licence // Licence: wxWindows licence
@@ -507,7 +507,7 @@ protected:
// //
// Return the icon for the given item. In report view, OnGetItemImage will // Return the icon for the given item. In report view, OnGetItemImage will
// only be called for the first column. See OnGetItemColumnImage for // only be called for the first column. See OnGetItemColumnImage for
// details. // details.
// //
virtual int OnGetItemImage(long lItem) const; virtual int OnGetItemImage(long lItem) const;

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

@@ -33,7 +33,7 @@ public:
protected: protected:
bool Free(); bool Free();
bool DoPlay(unsigned flags) const; bool DoPlay(unsigned flags) const;
private: private:

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

@@ -23,7 +23,7 @@ public:
{ {
SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN); SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
} }
wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
@@ -40,7 +40,7 @@ public:
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which); 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 #define wxOSX_USE_NATIVE_TOOLBAR 1
#endif #endif
/* /*
* text rendering system * text rendering system
*/ */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 #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; return this->m_PropertyID;
} }
void SetPropertyID(DataBrowserPropertyID newPropertyID) void SetPropertyID(DataBrowserPropertyID newPropertyID)
{ {
this->m_PropertyID = newPropertyID; this->m_PropertyID = newPropertyID;
@@ -189,7 +189,7 @@ public:
OSStatus GetPropertyFlags (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags ) const; 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 (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 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 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); OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);
@@ -270,7 +270,7 @@ public:
// container handling // container handling
// //
OSStatus CloseContainer(DataBrowserItemID containerID); OSStatus CloseContainer(DataBrowserItemID containerID);
OSStatus OpenContainer(DataBrowserItemID containerID); OSStatus OpenContainer(DataBrowserItemID containerID);
protected : protected :
@@ -315,7 +315,7 @@ protected :
// event handler for hit testing // event handler for hit testing
/// ///
void* m_macDataViewCtrlEventHandler; void* m_macDataViewCtrlEventHandler;
private: private:
// //
// wxWidget internal stuff // wxWidget internal stuff

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

@@ -302,12 +302,12 @@ public :
virtual bool IsVisible() const; virtual bool IsVisible() const;
virtual void Raise(); virtual void Raise();
virtual void Lower(); virtual void Lower();
virtual void ScrollRect( const wxRect *rect, int dx, int dy ); 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 Move(int x, int y, int width, int height);
virtual void GetPosition( int &x, int &y ) const; virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const; virtual void GetSize( int &width, int &height ) const;
@@ -316,7 +316,7 @@ public :
// where is in native window relative coordinates // where is in native window relative coordinates
virtual void SetNeedsDisplay( const wxRect* where = NULL ); virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const; virtual bool GetNeedsDisplay() const;
virtual bool CanFocus() const; virtual bool CanFocus() const;
// return true if successful // return true if successful
virtual bool SetFocus(); virtual bool SetFocus();
@@ -324,7 +324,7 @@ public :
void RemoveFromParent(); void RemoveFromParent();
void Embed( wxWidgetImpl *parent ); void Embed( wxWidgetImpl *parent );
void SetDefaultButton( bool isDefault ); void SetDefaultButton( bool isDefault );
void PerformClick(); void PerformClick();
void SetLabel( const wxString& title, wxFontEncoding encoding ); void SetLabel( const wxString& title, wxFontEncoding encoding );
@@ -369,7 +369,7 @@ public :
virtual wxInt32 GetMaximum() const; virtual wxInt32 GetMaximum() const;
virtual wxInt32 GetMinimum() const; virtual wxInt32 GetMinimum() const;
virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ); virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum );
virtual void SetRange( SInt32 minimum , SInt32 maximum ); virtual void SetRange( SInt32 minimum , SInt32 maximum );
@@ -451,7 +451,7 @@ public :
virtual void GetFeatures( UInt32 *features ); virtual void GetFeatures( UInt32 *features );
// to be moved into a tab control class // to be moved into a tab control class
virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ); virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable );
@@ -640,7 +640,7 @@ public :
} ; } ;
*/ */
class WXDLLIMPEXP_CORE wxMacDataItem class WXDLLIMPEXP_CORE wxMacDataItem
{ {
public : public :
wxMacDataItem(); wxMacDataItem();
@@ -817,7 +817,7 @@ protected :
class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn
{ {
public : public :
wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable ) wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable )
: m_property(propertyId), m_editable(editable), m_type( colType ) : m_property(propertyId), m_editable(editable), m_type( colType )
{ {
} }
@@ -825,9 +825,9 @@ public :
{ {
} }
DataBrowserPropertyID GetProperty() const { return m_property ; } DataBrowserPropertyID GetProperty() const { return m_property ; }
bool IsEditable() const { return m_editable; } bool IsEditable() const { return m_editable; }
DataBrowserPropertyType GetType() const { return m_type; } DataBrowserPropertyType GetType() const { return m_type; }
protected : protected :
@@ -844,12 +844,12 @@ class WXDLLIMPEXP_CORE wxMacDataBrowserCellValue : public wxListWidgetCellValue
public : public :
wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {} wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {}
virtual ~wxMacDataBrowserCellValue() {} virtual ~wxMacDataBrowserCellValue() {}
virtual void Set( CFStringRef value ); virtual void Set( CFStringRef value );
virtual void Set( const wxString& value ); virtual void Set( const wxString& value );
virtual void Set( int value ) ; virtual void Set( int value ) ;
virtual void Check( bool check ); virtual void Check( bool check );
virtual int GetIntValue() const ; virtual int GetIntValue() const ;
virtual wxString GetStringValue() const ; virtual wxString GetStringValue() const ;
protected : protected :
@@ -868,10 +868,10 @@ public:
wxListWidgetColumn* InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false, wxListWidgetColumn* InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ; 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) ; 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, const wxString& title, bool editable,
DataBrowserPropertyType colType, SInt16 just, int width ); DataBrowserPropertyType colType, SInt16 just, int width );
// add and remove // add and remove
@@ -1000,51 +1000,51 @@ public :
wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ; wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
wxNonOwnedWindowCarbonImpl(); wxNonOwnedWindowCarbonImpl();
virtual ~wxNonOwnedWindowCarbonImpl(); virtual ~wxNonOwnedWindowCarbonImpl();
virtual void Destroy() ; virtual void Destroy() ;
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ; long style, long extraStyle, const wxString& name ) ;
WXWindow GetWXWindow() const; WXWindow GetWXWindow() const;
void Raise(); void Raise();
void Lower(); void Lower();
bool Show(bool show); bool Show(bool show);
bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
void Update(); void Update();
bool SetTransparent(wxByte alpha); bool SetTransparent(wxByte alpha);
bool SetBackgroundColour(const wxColour& col ); bool SetBackgroundColour(const wxColour& col );
void SetExtraStyle( long exStyle ); void SetExtraStyle( long exStyle );
bool SetBackgroundStyle(wxBackgroundStyle style); bool SetBackgroundStyle(wxBackgroundStyle style);
bool CanSetTransparent(); bool CanSetTransparent();
void MoveWindow(int x, int y, int width, int height); void MoveWindow(int x, int y, int width, int height);
void GetPosition( int &x, int &y ) const; void GetPosition( int &x, int &y ) const;
void GetSize( int &width, int &height ) 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); bool SetShape(const wxRegion& region);
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void Iconize( bool iconize ); virtual void Iconize( bool iconize );
virtual void Maximize(bool maximize); virtual void Maximize(bool maximize);
virtual bool IsFullScreen() const; virtual bool IsFullScreen() const;
virtual bool ShowFullScreen(bool show, long style); virtual bool ShowFullScreen(bool show, long style);
virtual void RequestUserAttention(int flags); virtual void RequestUserAttention(int flags);
virtual void ScreenToWindow( int *x, int *y ); virtual void ScreenToWindow( int *x, int *y );
virtual void WindowToScreen( int *x, int *y ); virtual void WindowToScreen( int *x, int *y );
bool MacGetUnifiedAppearance() const ; bool MacGetUnifiedAppearance() const ;
void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ; void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
@@ -1052,18 +1052,18 @@ public :
void MacSetMetalAppearance( bool set ) ; void MacSetMetalAppearance( bool set ) ;
bool MacGetMetalAppearance() const ; bool MacGetMetalAppearance() const ;
void MacSetUnifiedAppearance( bool set ); void MacSetUnifiedAppearance( bool set );
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected : protected :
void MacInstallTopLevelWindowEventHandler(); void MacInstallTopLevelWindowEventHandler();
WXEVENTHANDLERREF m_macEventHandler ; WXEVENTHANDLERREF m_macEventHandler ;
WindowRef m_macWindow; WindowRef m_macWindow;
void * m_macFullScreenData ; void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl) DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
}; };
#endif // wxUSE_GUI #endif // wxUSE_GUI

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

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

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

@@ -34,10 +34,10 @@ public:
virtual void TransferFrom( wxPrintDialogData * ); virtual void TransferFrom( wxPrintDialogData * );
virtual void TransferTo( wxPrintDialogData * ); virtual void TransferTo( wxPrintDialogData * );
PMPrintSession GetPrintSession() { return m_macPrintSession; } PMPrintSession GetPrintSession() { return m_macPrintSession; }
PMPageFormat GetPageFormat() { return m_macPageFormat; } PMPageFormat GetPageFormat() { return m_macPageFormat; }
PMPrintSettings GetPrintSettings() { return m_macPrintSettings; } PMPrintSettings GetPrintSettings() { return m_macPrintSettings; }
protected : protected :
virtual void UpdateFromPMState(); virtual void UpdateFromPMState();
virtual void UpdateToPMState(); 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; virtual wxSize DoGetBestSize() const;
wxBitmap m_bitmap; wxBitmap m_bitmap;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif #endif

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

@@ -37,7 +37,7 @@ public:
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
// osx specific event handling common for all osx-ports // osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec );
protected: protected:
void DoSet3StateValue(wxCheckBoxState val); 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 // the array containing the checked status of the items
wxArrayInt m_checks; wxArrayInt m_checks;
wxListWidgetColumn* m_checkColumn ; wxListWidgetColumn* m_checkColumn ;
void Init(); 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 * we only use core graphics now on all builds, try to catch attempts
* to configure the build otherwise and give error messages * to configure the build otherwise and give error messages
*/ */
#if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS ) #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" # error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
#endif #endif
@@ -48,7 +48,7 @@
/* /*
* using mixins of cocoa functionality * using mixins of cocoa functionality
*/ */
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
#define wxOSX_USE_COCOA 1 #define wxOSX_USE_COCOA 1
#else #else
@@ -83,7 +83,7 @@
/* /*
* combination flags * combination flags
*/ */
#if wxOSX_USE_COCOA || wxOSX_USE_CARBON #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
#define wxOSX_USE_COCOA_OR_CARBON 1 #define wxOSX_USE_COCOA_OR_CARBON 1
#else #else

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

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

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

@@ -20,8 +20,8 @@
#define wxOSX_USE_NATIVE_TOOLBAR 1 #define wxOSX_USE_NATIVE_TOOLBAR 1
#endif #endif
/* /*
* text rendering system * text rendering system
*/ */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 #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; return this->m_NativeColumnPtr;
} }
void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr) void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr)
{ {
this->m_NativeColumnPtr = newNativeColumnPtr; this->m_NativeColumnPtr = newNativeColumnPtr;
@@ -235,11 +235,11 @@ private:
NSMutableArray* children; // buffered children NSMutableArray* children; // buffered children
NSMutableSet* items; // stores all items that are in use by the control NSMutableSet* items; // stores all items that are in use by the control
wxCocoaDataViewControl* implementation; wxCocoaDataViewControl* implementation;
wxDataViewModel* model; wxDataViewModel* model;
wxPointerObject* currentParentItem; // parent of the buffered children; the object is owned wxPointerObject* currentParentItem; // parent of the buffered children; the object is owned
} }
@@ -338,11 +338,11 @@ private:
@private @private
CGFloat xImageShift; // shift for the image in x-direction from border CGFloat xImageShift; // shift for the image in x-direction from border
CGFloat spaceImageText; // space between image and text ("belongs" to the image) CGFloat spaceImageText; // space between image and text ("belongs" to the image)
NSImage* image; // the image itself NSImage* image; // the image itself
NSSize imageSize; // largest size of the image; default size is (16, 16) NSSize imageSize; // largest size of the image; default size is (16, 16)
NSTextAlignment cellAlignment; // the text alignment is used to align the whole NSTextAlignment cellAlignment; // the text alignment is used to align the whole
// cell (image and text) // 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 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
{ {
public : public :
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
wxWidgetCocoaImpl() ; wxWidgetCocoaImpl() ;
~wxWidgetCocoaImpl(); ~wxWidgetCocoaImpl();
void Init(); void Init();
virtual bool IsVisible() const ; virtual bool IsVisible() const ;
virtual void SetVisibility(bool); virtual void SetVisibility(bool);
virtual void Raise(); virtual void Raise();
virtual void Lower(); virtual void Lower();
virtual void ScrollRect( const wxRect *rect, int dx, int dy ); 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 SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
void InstallEventHandler( WXWidget control = NULL ); void InstallEventHandler( WXWidget control = NULL );
virtual bool DoHandleMouseEvent(NSEvent *event); virtual bool DoHandleMouseEvent(NSEvent *event);
virtual bool DoHandleKeyEvent(NSEvent *event); virtual bool DoHandleKeyEvent(NSEvent *event);
virtual bool DoHandleCharEvent(NSEvent *event, NSString *text); 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); void SetFlipped(bool flipped);
virtual bool IsFlipped() const { return m_isFlipped; } virtual bool IsFlipped() const { return m_isFlipped; }
@@ -149,7 +149,7 @@ public :
virtual void resetCursorRects(WXWidget slf, void* _cmd); virtual void resetCursorRects(WXWidget slf, void* _cmd);
virtual bool isFlipped(WXWidget slf, void* _cmd); virtual bool isFlipped(WXWidget slf, void* _cmd);
virtual void drawRect(void* rect, WXWidget slf, void* _cmd); virtual void drawRect(void* rect, WXWidget slf, void* _cmd);
virtual void controlAction(WXWidget slf, void* _cmd, void* sender); virtual void controlAction(WXWidget slf, void* _cmd, void* sender);
virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender); virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
@@ -158,9 +158,9 @@ protected:
NSEvent* m_lastKeyDownEvent; NSEvent* m_lastKeyDownEvent;
bool m_isFlipped; bool m_isFlipped;
// if it the control has an editor, that editor will already send some // 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; bool m_hasEditor;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl) DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
}; };
@@ -171,59 +171,59 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
public : public :
wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ; wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
wxNonOwnedWindowCocoaImpl(); wxNonOwnedWindowCocoaImpl();
virtual ~wxNonOwnedWindowCocoaImpl(); virtual ~wxNonOwnedWindowCocoaImpl();
virtual void Destroy() ; virtual void Destroy() ;
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ; long style, long extraStyle, const wxString& name ) ;
WXWindow GetWXWindow() const; WXWindow GetWXWindow() const;
void Raise(); void Raise();
void Lower(); void Lower();
bool Show(bool show); bool Show(bool show);
bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
void Update(); void Update();
bool SetTransparent(wxByte alpha); bool SetTransparent(wxByte alpha);
bool SetBackgroundColour(const wxColour& col ); bool SetBackgroundColour(const wxColour& col );
void SetExtraStyle( long exStyle ); void SetExtraStyle( long exStyle );
bool SetBackgroundStyle(wxBackgroundStyle style); bool SetBackgroundStyle(wxBackgroundStyle style);
bool CanSetTransparent(); bool CanSetTransparent();
void MoveWindow(int x, int y, int width, int height); void MoveWindow(int x, int y, int width, int height);
void GetPosition( int &x, int &y ) const; void GetPosition( int &x, int &y ) const;
void GetSize( int &width, int &height ) 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); bool SetShape(const wxRegion& region);
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void Iconize( bool iconize ); virtual void Iconize( bool iconize );
virtual void Maximize(bool maximize); virtual void Maximize(bool maximize);
virtual bool IsFullScreen() const; virtual bool IsFullScreen() const;
virtual bool ShowFullScreen(bool show, long style); virtual bool ShowFullScreen(bool show, long style);
virtual void RequestUserAttention(int flags); virtual void RequestUserAttention(int flags);
virtual void ScreenToWindow( int *x, int *y ); virtual void ScreenToWindow( int *x, int *y );
virtual void WindowToScreen( int *x, int *y ); virtual void WindowToScreen( int *x, int *y );
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected : protected :
WX_wxNSWindow m_macWindow; WX_wxNSWindow m_macWindow;
void * m_macFullScreenData ; void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl) DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
}; };
#ifdef __OBJC__ #ifdef __OBJC__
@@ -231,16 +231,16 @@ protected :
WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect ); WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ); WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& 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 ); bool adjustForOrigin = true );
// used for many wxControls // used for many wxControls
@interface wxNSButton : NSButton @interface wxNSButton : NSButton
{ {
} }
@end @end
@interface wxNSBox : NSBox @interface wxNSBox : NSBox
@@ -276,7 +276,7 @@ protected :
@interface wxNSTextView : NSTextView @interface wxNSTextView : NSTextView
{ {
} }
@end @end
@interface wxNSMenu : NSMenu @interface wxNSMenu : NSMenu
@@ -287,7 +287,7 @@ protected :
- (void) setImplementation:(wxMenuImpl*) item; - (void) setImplementation:(wxMenuImpl*) item;
- (wxMenuImpl*) implementation; - (wxMenuImpl*) implementation;
@end @end
@interface wxNSMenuItem : NSMenuItem @interface wxNSMenuItem : NSMenuItem
{ {
@@ -300,8 +300,8 @@ protected :
- (void)clickedAction:(id)sender; - (void)clickedAction:(id)sender;
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
@end @end
void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c); 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 GetSelection( long* from, long* to) const ;
virtual void SetSelection( long from , long to ); virtual void SetSelection( long from , long to );
virtual void WriteText(const wxString& str) ; virtual void WriteText(const wxString& str) ;
virtual void controlAction(WXWidget slf, void* _cmd, void *sender); virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
protected : protected :
NSTextField* m_textField; NSTextField* m_textField;

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

@@ -2,7 +2,7 @@
// Name: config_xcode.pch // Name: config_xcode.pch
// Purpose: configurations for xcode builds // Purpose: configurations for xcode builds
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 29.04.04 // Created: 29.04.04
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) wxWidgets team // Copyright: (c) wxWidgets team
@@ -135,7 +135,7 @@
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1
// OBSOLETE ? // OBSOLETE ?
#define HAVE_COS 1 #define HAVE_COS 1
#define HAVE_FLOOR 1 #define HAVE_FLOOR 1
#define HAVE_INTTYPES_H 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 // Name: wx/mac/corefoundation/cfdata.h
// Purpose: wxCFDataRef class // Purpose: wxCFDataRef class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 2007/05/10 // Created: 2007/05/10
// RCS-ID: $Id: cfdataref.h 46095 2007-05-18 07:29:49Z SC $ // RCS-ID: $Id: cfdataref.h 46095 2007-05-18 07:29:49Z SC $
// Copyright: (c) 2007 Stefan Csomor // Copyright: (c) 2007 Stefan Csomor
@@ -33,7 +33,7 @@ public:
{} {}
typedef wxCFRef<CFDataRef> super_type; typedef wxCFRef<CFDataRef> super_type;
/*! @method wxCFDataRef /*! @method wxCFDataRef
@abstract Assumes ownership of p and creates a reference to it. @abstract Assumes ownership of p and creates a reference to it.
@templatefield otherType Any type. @templatefield otherType Any type.
@@ -65,7 +65,7 @@ public:
@param data The raw data. @param data The raw data.
@param length The data length. @param length The data length.
*/ */
wxCFDataRef(const UInt8* data, CFIndex length) wxCFDataRef(const UInt8* data, CFIndex length)
: super_type(CFDataCreate(kCFAllocatorDefault, data, length)) : super_type(CFDataCreate(kCFAllocatorDefault, data, length))
{ {
} }
@@ -80,7 +80,7 @@ public:
else else
return 0; return 0;
} }
/*! @method GetBytes /*! @method GetBytes
@abstract Copies the data into an external buffer @abstract Copies the data into an external buffer
@param range The desired range. @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 #if wxOSX_USE_COCOA_OR_IPHONE
wxCFStringRef(NSString* ref) wxCFStringRef(NSString* ref)
: wxCFRef< CFStringRef >((CFStringRef) ref) : wxCFRef< CFStringRef >((CFStringRef) ref)
{ {
} }
#endif #endif
wxCFStringRef(CFStringRef ref) wxCFStringRef(CFStringRef ref)
: wxCFRef< CFStringRef >(ref) : wxCFRef< CFStringRef >(ref)
{ {
} }
wxCFStringRef(const wxCFStringRef& otherRef ) wxCFStringRef(const wxCFStringRef& otherRef )
: wxCFRef< CFStringRef >(otherRef) : wxCFRef< CFStringRef >(otherRef)
{ {
} }
@@ -69,7 +69,7 @@ public:
} }
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const; wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
#if wxOSX_USE_COCOA_OR_IPHONE #if wxOSX_USE_COCOA_OR_IPHONE
static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; 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 // 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, wxPoint const& pos, wxSize const& size,
long style, long extraStyle); long style, long extraStyle);
wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control 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; wxString GetCommand(const wxString &verb, size_t nIndex) const;
// Read XDG *.desktop file // Read XDG *.desktop file
void LoadXDGApp(const wxString& filename); void LoadXDGApp(const wxString& filename);
// Scan XDG directory // Scan XDG directory
void LoadXDGAppsFilesFromDir(const wxString& dirname); 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 class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
{ {
public : public :
wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)
{ {
} }
virtual ~wxDeferredObjectDeleter() virtual ~wxDeferredObjectDeleter()
@@ -104,20 +104,20 @@ typedef wxWidgetImpl wxWidgetImplType;
#endif #endif
#if wxUSE_MENUS #if wxUSE_MENUS
class wxMenuItemImpl : public wxObject class wxMenuItemImpl : public wxObject
{ {
public : public :
wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer) wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
{ {
} }
virtual ~wxMenuItemImpl() ; virtual ~wxMenuItemImpl() ;
virtual void SetBitmap( const wxBitmap& bitmap ) = 0; virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
virtual void Enable( bool enable ) = 0; virtual void Enable( bool enable ) = 0;
virtual void Check( bool check ) = 0; virtual void Check( bool check ) = 0;
virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0; virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
virtual void Hide( bool hide = true ) = 0; virtual void Hide( bool hide = true ) = 0;
virtual void * GetHMenuItem() = 0; virtual void * GetHMenuItem() = 0;
wxMenuItem* GetWXPeer() { return m_peer ; } wxMenuItem* GetWXPeer() { return m_peer ; }
@@ -132,27 +132,27 @@ public :
protected : protected :
wxMenuItem* m_peer; wxMenuItem* m_peer;
DECLARE_ABSTRACT_CLASS(wxMenuItemImpl) DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
} ; } ;
class wxMenuImpl : public wxObject class wxMenuImpl : public wxObject
{ {
public : public :
wxMenuImpl( wxMenu* peer ) : m_peer(peer) wxMenuImpl( wxMenu* peer ) : m_peer(peer)
{ {
} }
virtual ~wxMenuImpl() ; virtual ~wxMenuImpl() ;
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0; virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;
virtual void Remove( wxMenuItem *pItem ) = 0; virtual void Remove( wxMenuItem *pItem ) = 0;
virtual void MakeRoot() = 0; virtual void MakeRoot() = 0;
virtual void SetTitle( const wxString& text ) = 0; virtual void SetTitle( const wxString& text ) = 0;
virtual WXHMENU GetHMenu() = 0; virtual WXHMENU GetHMenu() = 0;
wxMenu* GetWXPeer() { return m_peer ; } wxMenu* GetWXPeer() { return m_peer ; }
virtual void PopUp( wxWindow *win, int x, int y ) = 0; virtual void PopUp( wxWindow *win, int x, int y ) = 0;
@@ -161,7 +161,7 @@ public :
static wxMenuImpl* CreateRootMenu( wxMenu* peer ); static wxMenuImpl* CreateRootMenu( wxMenu* peer );
protected : protected :
wxMenu* m_peer; wxMenu* m_peer;
DECLARE_ABSTRACT_CLASS(wxMenuItemImpl) DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
} ; } ;
#endif #endif
@@ -179,7 +179,7 @@ public :
bool IsRootControl() const { return m_isRootControl; } bool IsRootControl() const { return m_isRootControl; }
wxWindowMac* GetWXPeer() const { return m_wxPeer; } wxWindowMac* GetWXPeer() const { return m_wxPeer; }
bool IsOk() const { return GetWXWidget() != NULL; } bool IsOk() const { return GetWXWidget() != NULL; }
// not only the control itself, but also all its parents must be visible // 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 SetVisibility( bool visible ) = 0;
virtual void Raise() = 0; virtual void Raise() = 0;
virtual void Lower() = 0; virtual void Lower() = 0;
virtual void ScrollRect( const wxRect *rect, int dx, int dy ) = 0; virtual void ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
virtual WXWidget GetWXWidget() const = 0; virtual WXWidget GetWXWidget() const = 0;
virtual void SetBackgroundColour( const wxColour& col ) = 0; virtual void SetBackgroundColour( const wxColour& col ) = 0;
// all coordinates in native parent widget relative coordinates // all coordinates in native parent widget relative coordinates
@@ -221,10 +221,10 @@ public :
// return true if successful // return true if successful
virtual bool SetFocus() = 0; virtual bool SetFocus() = 0;
virtual bool HasFocus() const = 0; virtual bool HasFocus() const = 0;
virtual void RemoveFromParent() = 0; virtual void RemoveFromParent() = 0;
virtual void Embed( wxWidgetImpl *parent ) = 0; virtual void Embed( wxWidgetImpl *parent ) = 0;
virtual void SetDefaultButton( bool isDefault ) = 0; virtual void SetDefaultButton( bool isDefault ) = 0;
virtual void PerformClick() = 0; virtual void PerformClick() = 0;
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 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 // is the clicked event sent AFTER the state already changed, so no additional
// state changing logic is required from the outside // state changing logic is required from the outside
virtual bool ButtonClickDidStateChange() = 0; virtual bool ButtonClickDidStateChange() = 0;
virtual void InstallEventHandler( WXWidget control = NULL ) = 0; virtual void InstallEventHandler( WXWidget control = NULL ) = 0;
// static methods for associating native controls and their implementations // static methods for associating native controls and their implementations
static wxWidgetImpl* static wxWidgetImpl*
FindFromWXWidget(WXWidget control); FindFromWXWidget(WXWidget control);
static void RemoveAssociations( wxWidgetImpl* impl); static void RemoveAssociations( wxWidgetImpl* impl);
static void Associate( WXWidget control, wxWidgetImpl *impl ); static void Associate( WXWidget control, wxWidgetImpl *impl );
static WXWidget FindFocus(); static WXWidget FindFocus();
// static creation methods, must be implemented by all toolkits // static creation methods, must be implemented by all toolkits
static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer, static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) ; long extraStyle) ;
static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ; static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ;
static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer, static wxWidgetImplType* CreateButton( 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) ;
static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer, static wxWidgetImplType* CreateDisclosureTriangle( 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) ;
static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle) ; long extraStyle) ;
static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer, static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxString& label, const wxPoint& pos,
const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) ; long extraStyle) ;
static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer, static wxWidgetImplType* CreateGroupBox( 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) ;
static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer, static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, 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 wxString& content,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) ; long extraStyle) ;
static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer, static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxString& content, const wxString& content,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle) ; long extraStyle) ;
static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer, static wxWidgetImplType* CreateCheckBox( 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);
static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer,
wxWindowMac* parent,
wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer, static wxWidgetImplType* CreateRadioButton( 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);
static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer, static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, 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 wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer, static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer, static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer, static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
wxInt32 value, wxInt32 value,
wxInt32 minimum, wxInt32 minimum,
wxInt32 maximum, wxInt32 maximum,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer, static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
wxInt32 value, wxInt32 value,
wxInt32 minimum, wxInt32 minimum,
wxInt32 maximum, wxInt32 maximum,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer, static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
wxInt32 value, wxInt32 value,
wxInt32 minimum, wxInt32 minimum,
wxInt32 maximum, wxInt32 maximum,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer, static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer, static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
wxMenu* menu, wxMenu* menu,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer, static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer,
wxWindowMac* parent, wxWindowMac* parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
long extraStyle); long extraStyle);
// converts from Toplevel-Content relative to local // converts from Toplevel-Content relative to local
@@ -467,7 +467,7 @@ protected :
// the interface to be implemented eg by a listbox // the interface to be implemented eg by a listbox
// //
class WXDLLIMPEXP_CORE wxListWidgetColumn class WXDLLIMPEXP_CORE wxListWidgetColumn
{ {
public : public :
virtual ~wxListWidgetColumn() {} virtual ~wxListWidgetColumn() {}
@@ -478,12 +478,12 @@ class WXDLLIMPEXP_CORE wxListWidgetCellValue
public : public :
wxListWidgetCellValue() {} wxListWidgetCellValue() {}
virtual ~wxListWidgetCellValue() {} virtual ~wxListWidgetCellValue() {}
virtual void Set( CFStringRef value ) = 0; virtual void Set( CFStringRef value ) = 0;
virtual void Set( const wxString& value ) = 0; virtual void Set( const wxString& value ) = 0;
virtual void Set( int value ) = 0; virtual void Set( int value ) = 0;
virtual void Check( bool check ); virtual void Check( bool check );
virtual bool IsChecked() const; virtual bool IsChecked() const;
virtual int GetIntValue() const = 0; virtual int GetIntValue() const = 0;
virtual wxString GetStringValue() const = 0; virtual wxString GetStringValue() const = 0;
@@ -494,12 +494,12 @@ class WXDLLIMPEXP_CORE wxListWidgetImpl
public: public:
wxListWidgetImpl() {} wxListWidgetImpl() {}
virtual ~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 ; 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 ; wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
// add and remove // add and remove
// TODO will be replaced // TODO will be replaced
@@ -514,7 +514,7 @@ public:
virtual int ListGetSelection() const = 0; virtual int ListGetSelection() const = 0;
virtual int ListGetSelections( wxArrayInt& aSelections ) const = 0; virtual int ListGetSelections( wxArrayInt& aSelections ) const = 0;
virtual bool ListIsSelected( unsigned int n ) const = 0; virtual bool ListIsSelected( unsigned int n ) const = 0;
// display // display
virtual void ListScrollTo( unsigned int n ) = 0; virtual void ListScrollTo( unsigned int n ) = 0;
@@ -618,21 +618,21 @@ public :
virtual ~wxNonOwnedWindowImpl() virtual ~wxNonOwnedWindowImpl()
{ {
} }
virtual void Destroy() virtual void Destroy()
{ {
} }
virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) = 0; long style, long extraStyle, const wxString& name ) = 0;
virtual WXWindow GetWXWindow() const = 0; virtual WXWindow GetWXWindow() const = 0;
virtual void Raise() virtual void Raise()
{ {
} }
virtual void Lower() virtual void Lower()
{ {
} }
@@ -641,12 +641,12 @@ public :
{ {
return false; return false;
} }
virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout)) virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
{ {
return Show(show); return Show(show);
} }
virtual void Update() virtual void Update()
{ {
} }
@@ -664,18 +664,18 @@ public :
virtual void SetExtraStyle( long WXUNUSED(exStyle) ) virtual void SetExtraStyle( long WXUNUSED(exStyle) )
{ {
} }
virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style)) virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
{ {
return false ; return false ;
} }
bool CanSetTransparent() bool CanSetTransparent()
{ {
return false; 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 MoveWindow(int x, int y, int width, int height) = 0;
virtual void GetPosition( int &x, int &y ) const = 0; virtual void GetPosition( int &x, int &y ) const = 0;
virtual void GetSize( int &width, int &height ) const = 0; virtual void GetSize( int &width, int &height ) const = 0;
@@ -684,31 +684,31 @@ public :
{ {
return false; return false;
} }
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0; virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;
virtual bool IsMaximized() const = 0; virtual bool IsMaximized() const = 0;
virtual bool IsIconized() const= 0; virtual bool IsIconized() const= 0;
virtual void Iconize( bool iconize )= 0; virtual void Iconize( bool iconize )= 0;
virtual void Maximize(bool maximize) = 0; virtual void Maximize(bool maximize) = 0;
virtual bool IsFullScreen() const= 0; virtual bool IsFullScreen() const= 0;
virtual bool ShowFullScreen(bool show, long style)= 0; virtual bool ShowFullScreen(bool show, long style)= 0;
virtual void RequestUserAttention(int flags) = 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; virtual void WindowToScreen( int *x, int *y ) = 0;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
// static creation methods, must be implemented by all toolkits // static creation methods, must be implemented by all toolkits
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ; long style, long extraStyle, const wxString& name ) ;

Some files were not shown because too many files have changed in this diff Show More