merge of new wxMac code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-27 07:15:02 +00:00
parent 34a336adb6
commit 4f30545658
18 changed files with 322 additions and 1258 deletions

View File

@@ -48,8 +48,8 @@ public:
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
virtual void SetStyle(int style) ;
virtual void SetStipple(const wxBitmap& stipple) ;
virtual void SetMacTheme(short macThemeBrush) ;
virtual void SetMacThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ;
virtual void MacSetTheme(short macThemeBrush) ;
virtual void MacSetThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ;
wxBrush& operator = (const wxBrush& brush)
{ if (*this == brush) return (*this); Ref(brush); return *this; }
@@ -60,8 +60,8 @@ public:
wxMacBrushKind MacGetBrushKind() const ;
unsigned long GetMacThemeBackground(WXRECTPTR extent) const ;
short GetMacTheme() const ;
unsigned long MacGetThemeBackground(WXRECTPTR extent) const ;
short MacGetTheme() const ;
wxColour& GetColour() const ;
int GetStyle() const ;
wxBitmap *GetStipple() const ;