gave default parameters for wxBrush() ctor from wxColour (this is what is used in 99 of cases...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ac32ba44a1
commit
5b36366c59
@ -2,21 +2,19 @@
|
|||||||
#define _WX_BRUSH_H_BASE_
|
#define _WX_BRUSH_H_BASE_
|
||||||
|
|
||||||
#if defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
#include "wx/msw/brush.h"
|
#include "wx/msw/brush.h"
|
||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__) || defined(__WXX11__)
|
||||||
#include "wx/x11/brush.h"
|
#include "wx/x11/brush.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
#include "wx/gtk/brush.h"
|
#include "wx/gtk/brush.h"
|
||||||
#elif defined(__WXX11__)
|
|
||||||
#include "wx/x11/brush.h"
|
|
||||||
#elif defined(__WXMGL__)
|
#elif defined(__WXMGL__)
|
||||||
#include "wx/mgl/brush.h"
|
#include "wx/mgl/brush.h"
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
#include "wx/mac/brush.h"
|
#include "wx/mac/brush.h"
|
||||||
#elif defined(__WXCOCOA__)
|
#elif defined(__WXCOCOA__)
|
||||||
#include "wx/cocoa/brush.h"
|
#include "wx/cocoa/brush.h"
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
#include "wx/os2/brush.h"
|
#include "wx/os2/brush.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
|
|||||||
public:
|
public:
|
||||||
wxBrush() { }
|
wxBrush() { }
|
||||||
|
|
||||||
wxBrush( const wxColour &colour, int style );
|
wxBrush( const wxColour &colour, int style = wxSOLID );
|
||||||
wxBrush( const wxBitmap &stippleBitmap );
|
wxBrush( const wxBitmap &stippleBitmap );
|
||||||
~wxBrush();
|
~wxBrush();
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
|
|||||||
public:
|
public:
|
||||||
wxBrush() { }
|
wxBrush() { }
|
||||||
|
|
||||||
wxBrush( const wxColour &colour, int style );
|
wxBrush( const wxColour &colour, int style = wxSOLID );
|
||||||
wxBrush( const wxBitmap &stippleBitmap );
|
wxBrush( const wxBitmap &stippleBitmap );
|
||||||
~wxBrush();
|
~wxBrush();
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
|
|||||||
public:
|
public:
|
||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush(short macThemeBrush ) ;
|
wxBrush(short macThemeBrush ) ;
|
||||||
wxBrush(const wxColour& col, int style);
|
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||||
wxBrush(const wxBitmap& stipple);
|
wxBrush(const wxBitmap& stipple);
|
||||||
wxBrush(const wxBrush& brush)
|
wxBrush(const wxBrush& brush)
|
||||||
: wxGDIObject()
|
: wxGDIObject()
|
||||||
|
@ -36,7 +36,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxBrush() {}
|
wxBrush() {}
|
||||||
wxBrush(const wxColour &colour, int style);
|
wxBrush(const wxColour &colour, int style = wxSOLID);
|
||||||
wxBrush(const wxBitmap &stippleBitmap);
|
wxBrush(const wxBitmap &stippleBitmap);
|
||||||
wxBrush(const wxBrush &brush);
|
wxBrush(const wxBrush &brush);
|
||||||
~wxBrush() {}
|
~wxBrush() {}
|
||||||
|
@ -30,7 +30,7 @@ class WXDLLEXPORT wxBrush : public wxGDIObject
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush(const wxColour& col, int style);
|
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||||
wxBrush(const wxBitmap& stipple);
|
wxBrush(const wxBitmap& stipple);
|
||||||
wxBrush(const wxBrush& brush) { Ref(brush); }
|
wxBrush(const wxBrush& brush) { Ref(brush); }
|
||||||
virtual ~wxBrush();
|
virtual ~wxBrush();
|
||||||
|
@ -44,7 +44,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
|
|||||||
public:
|
public:
|
||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush( const wxColour& rCol
|
wxBrush( const wxColour& rCol
|
||||||
,int nStyle
|
,int nStyle = wxSOLID
|
||||||
);
|
);
|
||||||
wxBrush(const wxBitmap& rStipple);
|
wxBrush(const wxBitmap& rStipple);
|
||||||
inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
|
inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
|
||||||
|
@ -35,7 +35,7 @@ class wxBrush: public wxGDIObject
|
|||||||
public:
|
public:
|
||||||
wxBrush() { }
|
wxBrush() { }
|
||||||
|
|
||||||
wxBrush( const wxColour &colour, int style );
|
wxBrush( const wxColour &colour, int style = wxSOLID );
|
||||||
wxBrush( const wxBitmap &stippleBitmap );
|
wxBrush( const wxBitmap &stippleBitmap );
|
||||||
~wxBrush();
|
~wxBrush();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user