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

Just deprecate but don't schedule for removal wxNORMAL and friends.

Browse Source 
Deprecate the use of the old untyped constants but don't schedule them from
removal in a future wx version by removing "#if WXWIN_COMPATIBILITY_3_0" tests
around their definition and use. Provoking deprecation warnings in the code
using these constants is worth it as they are unclear and it's easy to make
mistakes when using them, but breaking this code compilation outright can't be
justified -- even in the future.

Also use more informational wxDEPRECATED_MSG() instead of a simple
wxDEPRECATED() as it might not be obvious at all how should the code be
updated exactly.

Finally, avoid the use of deprecated constants inside the library itself.

As a side effect, this closes #15814.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-06 12:42:37 +00:00
parent f5b1cc026d
commit bd30752410
58 changed files with 341 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/brush.h
View File

@@ -93,10 +93,9 @@ public:
wxBrush *FindOrCreateBrush(const wxColour& colour,
wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
{ return FindOrCreateBrush(colour, (wxBrushStyle)style); }
#endif
};
extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
@@ -107,25 +106,24 @@ extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
//
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_0
// Unfortunately some compilers have ambiguity issues when enum comparisons are
// overloaded so we have to disable the overloads in this case, see
// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
{
return static_cast<int>(s) == static_cast<int>(t);
}
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
{
return !(s == t);
return static_cast<int>(s) != static_cast<int>(t);
}
#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
#endif // WXWIN_COMPATIBILITY_3_0
#endif // _WX_BRUSH_H_BASE_

13
include/wx/cocoa/brush.h
View File

@@ -29,9 +29,6 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
public:
wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap& stipple);
virtual ~wxBrush();
@@ -54,10 +51,12 @@ public:
virtual wxBrushStyle GetStyle() const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
// wxCocoa
WX_NSColor GetNSColor();

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

@@ -53,18 +53,6 @@ public:
/*! @abstract Platform-independent construction with individual properties
*/
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = FALSE,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -133,6 +121,19 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = FALSE,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// implementation only from now on
// -------------------------------

13
include/wx/cocoa/pen.h
View File

@@ -25,9 +25,6 @@ class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
public:
wxPen();
wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen(const wxBitmap& stipple, int width);
virtual ~wxPen();
@@ -53,10 +50,12 @@ public:
int GetDashes(wxDash **ptr) const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
// Cocoa-specific
WX_NSColor GetNSColor();

3
include/wx/defs.h
View File

@@ -2416,8 +2416,6 @@ enum wxHatchStyle
wxPenStyle, wxPenCap, wxPenJoin enum values instead!
*/
#if WXWIN_COMPATIBILITY_3_0
/* don't use any elements of this enum in the new code */
enum wxDeprecatedGUIConstants
{
@@ -2467,7 +2465,6 @@ enum wxDeprecatedGUIConstants
wxFIRST_HATCH = wxHATCHSTYLE_FIRST,
wxLAST_HATCH = wxHATCHSTYLE_LAST
};
#endif
/* ToolPanel in wxFrame (VZ: unused?) */
enum

13
include/wx/dfb/brush.h
View File

@@ -32,9 +32,6 @@ class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
public:
wxBrush() {}
wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap &stippleBitmap);
bool operator==(const wxBrush& brush) const;
@@ -49,10 +46,12 @@ public:
void SetStyle(wxBrushStyle style);
void SetStipple(const wxBitmap& stipple);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

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

@@ -38,18 +38,6 @@ public:
}
wxFont(const wxNativeFontInfo& info) { Create(info); }
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
@@ -103,6 +91,19 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// implementation from now on:
wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const;

13
include/wx/dfb/pen.h
View File

@@ -32,9 +32,6 @@ class WXDLLIMPEXP_CORE wxPen: public wxPenBase
public:
wxPen() {}
wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen(const wxBitmap& stipple, int width);
@@ -60,10 +57,12 @@ public:
wxDash* GetDash() const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

119
include/wx/font.h
View File

@@ -285,32 +285,6 @@ public:
virtual ~wxFontBase();
#if WXWIN_COMPATIBILITY_3_0
// from the font components
static wxFont *New(
int pointSize, // size of the font in points
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
bool underlined = false, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ...
{ return New(pointSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underlined, face, encoding); }
// from the font components
static wxFont *New(
const wxSize& pixelSize, // size of the font in pixels
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
bool underlined = false, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ...
{ return New(pixelSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underlined, face, encoding); }
#endif
// from the font components
static wxFont *New(
int pointSize, // size of the font in points
@@ -423,6 +397,33 @@ public:
wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
#endif // WXWIN_COMPATIBILITY_2_8
// from the font components
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
static wxFont *New(
int pointSize, // size of the font in points
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
bool underlined = false, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ...
{ return New(pointSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underlined, face, encoding); }
// from the font components
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
static wxFont *New(
const wxSize& pixelSize, // size of the font in pixels
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
bool underlined = false, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) // ISO8859-X, ...
{ return New(pixelSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underlined, face, encoding); }
protected:
// the function called by both overloads of SetNativeFontInfo()
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
@@ -475,27 +476,26 @@ WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font);
WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
#if WXWIN_COMPATIBILITY_3_0
#define wxDECLARE_FONT_COMPAT_SETTER \
wxDEPRECATED( void SetFamily(int family) ) \
{ SetFamily((wxFontFamily)family); } \
wxDEPRECATED( void SetStyle(int style) ) \
{ SetStyle((wxFontStyle)style); } \
wxDEPRECATED( void SetWeight(int weight) ) \
{ SetWeight((wxFontWeight)weight); } \
wxDEPRECATED( void SetFamily(wxDeprecatedGUIConstants family) ) \
{ SetFamily((wxFontFamily)family); } \
wxDEPRECATED( void SetStyle(wxDeprecatedGUIConstants style) ) \
{ SetStyle((wxFontStyle)style); } \
wxDEPRECATED( void SetWeight(wxDeprecatedGUIConstants weight) ) \
{ SetWeight((wxFontWeight)weight); }
#else
#define wxDECLARE_FONT_COMPAT_SETTER /*empty*/
#endif
// this macro must be used in all derived wxFont classes declarations
#define wxDECLARE_COMMON_FONT_METHODS() \
wxDECLARE_FONT_COMPAT_SETTER \
wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \
void SetFamily(int family) \
{ SetFamily((wxFontFamily)family); } \
wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \
void SetStyle(int style) \
{ SetStyle((wxFontStyle)style); } \
wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \
void SetWeight(int weight) \
{ SetWeight((wxFontWeight)weight); } \
wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \
void SetFamily(wxDeprecatedGUIConstants family) \
{ SetFamily((wxFontFamily)family); } \
wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \
void SetStyle(wxDeprecatedGUIConstants style) \
{ SetStyle((wxFontStyle)style); } \
wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \
void SetWeight(wxDeprecatedGUIConstants weight) \
{ SetWeight((wxFontWeight)weight); } \
\
/* functions for modifying font in place */ \
wxFont& MakeBold(); \
@@ -546,14 +546,13 @@ public:
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
#if WXWIN_COMPATIBILITY_3_0
wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
bool underline = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{ return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
(wxFontWeight)weight, underline, face, encoding); }
#endif
};
extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
@@ -565,29 +564,31 @@ extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
//
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_0
// Unfortunately some compilers have ambiguity issues when enum comparisons are
// overloaded so we have to disable the overloads in this case, see
// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \
inline bool operator==(wxFontFamily s, wxDeprecatedGUIConstants t)
{ return static_cast<int>(s) == static_cast<int>(t); }
{ return static_cast<int>(s) == static_cast<int>(t); }
wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \
inline bool operator!=(wxFontFamily s, wxDeprecatedGUIConstants t)
{ return !(s == t); }
{ return static_cast<int>(s) != static_cast<int>(t); }
wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \
inline bool operator==(wxFontStyle s, wxDeprecatedGUIConstants t)
{ return static_cast<int>(s) == static_cast<int>(t); }
{ return static_cast<int>(s) == static_cast<int>(t); }
wxDEPRECATED_MSG("use wxFONTSTYLE_XXX constants") \
inline bool operator!=(wxFontStyle s, wxDeprecatedGUIConstants t)
{ return !(s == t); }
{ return static_cast<int>(s) != static_cast<int>(t); }
wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \
inline bool operator==(wxFontWeight s, wxDeprecatedGUIConstants t)
{ return static_cast<int>(s) == static_cast<int>(t); }
{ return static_cast<int>(s) == static_cast<int>(t); }
wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \
inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t)
{ return !(s == t); }
{ return static_cast<int>(s) != static_cast<int>(t); }
#endif // // wxCOMPILER_NO_OVERLOAD_ON_ENUM
#endif // WXWIN_COMPATIBILITY_3_0
#endif
// _WX_FONT_H_BASE_
#endif // _WX_FONT_H_BASE_

12
include/wx/gtk/brush.h
View File

@@ -22,9 +22,6 @@ public:
wxBrush() { }
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush( const wxBitmap &stippleBitmap );
virtual ~wxBrush();
@@ -40,10 +37,11 @@ public:
void SetStyle( wxBrushStyle style );
void SetStipple( const wxBitmap& stipple );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

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

@@ -27,19 +27,6 @@ public:
wxFont(const wxNativeFontInfo& info);
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -98,6 +85,18 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// Set Pango attributes in the specified layout. Currently only
// underlined and strike-through attributes are handled by this function.
//

13
include/wx/gtk/pen.h
View File

@@ -21,9 +21,6 @@ public:
wxPen() { }
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
virtual ~wxPen();
@@ -49,10 +46,12 @@ public:
wxDash* GetDash() const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

13
include/wx/gtk1/brush.h
View File

@@ -32,9 +32,6 @@ public:
wxBrush() { }
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush( const wxBitmap &stippleBitmap );
virtual ~wxBrush();
@@ -50,10 +47,12 @@ public:
void SetStyle( wxBrushStyle style );
void SetStipple( const wxBitmap& stipple );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
private:
virtual wxGDIRefData *CreateGDIRefData() const;

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

@@ -52,19 +52,6 @@ public:
wxFont(const wxNativeFontInfo& info);
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -122,6 +109,18 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// implementation from now on
void Unshare();

13
include/wx/gtk1/pen.h
View File

@@ -37,9 +37,6 @@ public:
wxPen() { }
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
bool operator==(const wxPen& pen) const;
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
@@ -63,10 +60,12 @@ public:
wxDash* GetDash() const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
private:
virtual wxGDIRefData *CreateGDIRefData() const;

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

@@ -43,19 +43,6 @@ public:
wxFont(const wxNativeFontInfo& info);
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -113,6 +100,19 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// Implementation
// Find an existing, or create a new, XFontStruct

13
include/wx/msw/brush.h
View File

@@ -24,9 +24,6 @@ class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
public:
wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap& stipple);
virtual ~wxBrush();
@@ -42,10 +39,12 @@ public:
wxBrushStyle GetStyle() const;
wxBitmap *GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
// return the HBRUSH for this brush
virtual WXHANDLE GetResourceHandle() const;

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

@@ -25,19 +25,6 @@ public:
wxFont(const wxFontInfo& info);
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -61,20 +48,6 @@ public:
weight, underlined, face, encoding);
}
#if WXWIN_COMPATIBILITY_3_0
wxFont(const wxSize& pixelSize,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight,
underlined, face, encoding);
}
#endif
wxFont(const wxSize& pixelSize,
wxFontFamily family,
wxFontStyle style,
@@ -137,6 +110,31 @@ public:
virtual bool IsFixedWidth() const;
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(const wxSize& pixelSize,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight,
underlined, face, encoding);
}
// implementation only from now on
// -------------------------------

14
include/wx/msw/pen.h
View File

@@ -23,9 +23,6 @@ class WXDLLIMPEXP_CORE wxPen : public wxPenBase
public:
wxPen() { }
wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen(const wxBitmap& stipple, int width);
virtual ~wxPen() { }
@@ -54,10 +51,13 @@ public:
int GetDashCount() const;
wxBitmap* GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
// internal: wxGDIObject methods
virtual bool RealizeResource();

13
include/wx/os2/brush.h
View File

@@ -19,9 +19,6 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
public:
wxBrush();
wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap& rStipple);
virtual ~wxBrush();
@@ -39,10 +36,12 @@ public:
wxBitmap* GetStipple(void) const;
int GetPS(void) const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
//
// Implementation

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

@@ -40,19 +40,6 @@ public:
SetPixelSize(info.GetPixelSize());
}
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -123,6 +110,19 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
//
// For internal use only!
//

13
include/wx/os2/pen.h
View File

@@ -28,9 +28,6 @@ public:
,int nWidth = 1
,wxPenStyle nStyle = wxPENSTYLE_SOLID
);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen( const wxBitmap& rStipple
,int nWidth
@@ -68,10 +65,12 @@ public:
int GetDashCount() const;
wxBitmap* GetStipple(void) const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
//
// Implementation

13
include/wx/osx/brush.h
View File

@@ -23,9 +23,6 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
public:
wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap& stipple);
virtual ~wxBrush();
@@ -41,10 +38,12 @@ public:
wxBrushStyle GetStyle() const ;
wxBitmap *GetStipple() const ;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

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

@@ -56,19 +56,6 @@ public:
wxFont(WX_NSFont nsfont);
#endif
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -133,6 +120,19 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// implementation only from now on
// -------------------------------

13
include/wx/osx/pen.h
View File

@@ -21,9 +21,6 @@ class WXDLLIMPEXP_CORE wxPen : public wxPenBase
public:
wxPen();
wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen(const wxBitmap& stipple, int width);
virtual ~wxPen();
@@ -52,10 +49,12 @@ public:
wxBitmap *GetStipple() const ;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
// Implementation

10
include/wx/pen.h
View File

@@ -122,10 +122,9 @@ public:
int width = 1,
wxPenStyle style = wxPENSTYLE_SOLID);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen *FindOrCreatePen(const wxColour& colour, int width, int style)
{ return FindOrCreatePen(colour, width, (wxPenStyle)style); }
#endif
};
extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList;
@@ -136,25 +135,24 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList;
//
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_0
// Unfortunately some compilers have ambiguity issues when enum comparisons are
// overloaded so we have to disable the overloads in this case, see
// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
{
return static_cast<int>(s) == static_cast<int>(t);
}
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
{
return !(s == t);
return static_cast<int>(s) != static_cast<int>(t);
}
#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
#endif // WXWIN_COMPATIBILITY_3_0
#endif // _WX_PEN_H_BASE_

13
include/wx/x11/brush.h
View File

@@ -31,9 +31,6 @@ public:
wxBrush() { }
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxBrush(const wxColour& col, int style) );
#endif
wxBrush( const wxBitmap &stippleBitmap );
virtual ~wxBrush();
@@ -49,10 +46,12 @@ public:
void SetStyle( wxBrushStyle style );
void SetStipple( const wxBitmap& stipple );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
wxBrush(const wxColour& col, int style);
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

25
include/wx/x11/font.h
View File

@@ -34,19 +34,6 @@ public:
SetPixelSize(info.GetPixelSize());
}
#if WXWIN_COMPATIBILITY_3_0
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
#endif
wxFont(int size,
wxFontFamily family,
wxFontStyle style,
@@ -112,6 +99,18 @@ public:
wxDECLARE_COMMON_FONT_METHODS();
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants")
wxFont(int size,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
(void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
}
// Implementation
#if wxUSE_PANGO

12
include/wx/x11/pen.h
View File

@@ -34,9 +34,6 @@ public:
wxPen() { }
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
#endif
wxPen( const wxBitmap &stipple, int width );
virtual ~wxPen();
@@ -63,10 +60,11 @@ public:
wxDash* GetDash() const;
wxBitmap* GetStipple() const;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxPenStyle)style); }
#endif
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
protected:
virtual wxGDIRefData *CreateGDIRefData() const;

2
src/aui/dockart.cpp
View File

@@ -196,7 +196,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
#ifdef __WXMAC__
m_captionFont = *wxSMALL_FONT;
#else
m_captionFont = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE);
m_captionFont = wxFont(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
#endif
// default metric values

8
src/common/dcgraph.cpp
View File

@@ -550,7 +550,7 @@ void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1,
-atan2(double(y2 - yc), double(x2 - xc)) * RAD2DEG;
}
bool fill = m_brush.GetStyle() != wxTRANSPARENT;
bool fill = m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT;
wxGraphicsPath path = m_graphicContext->CreatePath();
if ( fill && ((x1!=x2)||(y1!=y2)) )
@@ -578,7 +578,7 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
// get clockwise angles
if ( m_brush.GetStyle() != wxTRANSPARENT )
if ( m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
{
wxGraphicsPath path = m_graphicContext->CreatePath();
path.MoveToPoint( 0, 0 );
@@ -691,7 +691,9 @@ void wxGCDCImpl::DoDrawPolygon( int n, const wxPoint points[],
{
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") );
if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
if ( n <= 0 ||
(m_brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT &&
m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) )
return;
if ( !m_logicalFunctionSupported )
return;

8
src/common/gdicmn.cpp
View File

@@ -613,7 +613,8 @@ const wxFont* wxStockGDI::GetFont(Item item)
switch (item)
{
case FONT_ITALIC:
font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL);
font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(),
wxFONTFAMILY_ROMAN, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL);
break;
case FONT_NORMAL:
font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
@@ -631,10 +632,11 @@ const wxFont* wxStockGDI::GetFont(Item item)
#else
- 2,
#endif
wxSWISS, wxNORMAL, wxNORMAL);
wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
break;
case FONT_SWISS:
font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(),
wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
break;
default:
wxFAIL;

2
src/dfb/brush.cpp
View File

@@ -68,12 +68,10 @@ wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
m_refData = new wxBrushRefData(colour, style);
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
}
#endif
wxBrush::wxBrush(const wxBitmap &stippleBitmap)
{

2
src/dfb/pen.cpp
View File

@@ -67,12 +67,10 @@ wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)
m_refData = new wxPenRefData(colour, style);
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& col, int width, int style)
{
m_refData = new wxPenRefData(col, (wxPenStyle)style);
}
#endif
wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
{

2
src/generic/tipdlg.cpp
View File

@@ -246,7 +246,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
wxDEFAULT_CONTROL_BORDER
);
#if defined(__WXMSW__)
m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
m_text->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
#endif
//#if defined(__WXPM__)

2
src/gtk/brush.cpp
View File

@@ -60,12 +60,10 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
m_refData = new wxBrushRefData(colour, style);
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
}
#endif
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{

20
src/gtk/font.cpp
View File

@@ -113,6 +113,18 @@ void wxFontRefData::Init(int pointSize,
const wxString& faceName,
wxFontEncoding WXUNUSED(encoding))
{
// Old code could wrongly specify wxDEFAULT instead of -1 or wxNORMAL or,
// preferably, wxFONTSTYLE_NORMAL or wxFONTWEIGHT_NORMAL, continue handling
// this for compatibility.
if ( pointSize == wxDEFAULT )
pointSize = -1;
if ( static_cast<int>(style) == wxDEFAULT )
style = wxFONTSTYLE_NORMAL;
if ( static_cast<int>(weight) == wxDEFAULT )
weight = wxFONTWEIGHT_NORMAL;
if (family == wxFONTFAMILY_DEFAULT)
family = wxFONTFAMILY_SWISS;
@@ -130,11 +142,9 @@ void wxFontRefData::Init(int pointSize,
SetFamily(family);
}
SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
? wxDEFAULT_FONT_SIZE
: pointSize );
SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
SetStyle( style );
SetPointSize( pointSize == -1 ? wxDEFAULT_FONT_SIZE : pointSize );
SetWeight( weight );
SetUnderlined( underlined );
SetStrikethrough( strikethrough );
}

2
src/gtk/pen.cpp
View File

@@ -95,7 +95,6 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
M_PENDATA->m_colour = colour;
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData();
@@ -103,7 +102,6 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
M_PENDATA->m_style = (wxPenStyle)style;
M_PENDATA->m_colour = colour;
}
#endif
wxPen::~wxPen()
{

2
src/gtk1/brush.cpp
View File

@@ -62,14 +62,12 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
M_BRUSHDATA->m_colour = colour;
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData;
M_BRUSHDATA->m_style = (wxBrushStyle)style;
M_BRUSHDATA->m_colour = col;
}
#endif
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{

2
src/gtk1/pen.cpp
View File

@@ -95,7 +95,6 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
M_PENDATA->m_colour = colour;
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData();
@@ -103,7 +102,6 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
M_PENDATA->m_style = (wxPenStyle)style;
M_PENDATA->m_colour = colour;
}
#endif
wxGDIRefData *wxPen::CreateGDIRefData() const
{

6
src/html/helpwnd.cpp
View File

@@ -1329,12 +1329,14 @@ void wxHtmlHelpWindow::OptionsDialog()
// are so that we can pass them to the dialog:
if (m_NormalFace.empty())
{
wxFont fnt(m_FontSize, wxSWISS, wxNORMAL, wxNORMAL, false);
wxFont fnt(m_FontSize,
wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
m_NormalFace = fnt.GetFaceName();
}
if (m_FixedFace.empty())
{
wxFont fnt(m_FontSize, wxMODERN, wxNORMAL, wxNORMAL, false);
wxFont fnt(m_FontSize,
wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
m_FixedFace = fnt.GetFaceName();
}

6
src/html/winpars.cpp
View File

@@ -611,9 +611,9 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
*faceptr = face;
*fontptr = new wxFont(
(int) (m_FontsSizes[fs] * m_FontScale),
ff ? wxMODERN : wxSWISS,
fi ? wxITALIC : wxNORMAL,
fb ? wxBOLD : wxNORMAL,
ff ? wxFONTFAMILY_MODERN : wxFONTFAMILY_SWISS,
fi ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL,
fb ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL,
fu ? true : false, face
#if wxUSE_UNICODE
);

2
src/msw/brush.cpp
View File

@@ -232,12 +232,10 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
m_refData = new wxBrushRefData(col, style);
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
}
#endif
wxBrush::wxBrush(const wxBitmap& stipple)
{

6
src/msw/graphics.cpp
View File

@@ -785,7 +785,7 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB
: wxGraphicsObjectRefData(renderer)
{
Init();
if ( brush.GetStyle() == wxSOLID)
if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID)
{
m_brush = new SolidBrush(wxColourToColor( brush.GetColour()));
}
@@ -2114,7 +2114,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub
wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
{
ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen);
if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT )
if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
return wxNullGraphicsPen;
else
{
@@ -2127,7 +2127,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )
{
ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT )
if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
return wxNullGraphicsBrush;
else
{

2
src/msw/pen.cpp
View File

@@ -432,12 +432,10 @@ wxPen::wxPen(const wxColour& col, int width, wxPenStyle style)
m_refData = new wxPenRefData(col, width, style);
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData(colour, width, (wxPenStyle)style);
}
#endif
wxPen::wxPen(const wxBitmap& stipple, int width)
{

2
src/os2/brush.cpp
View File

@@ -116,14 +116,12 @@ wxBrush::wxBrush(
RealizeResource();
} // end of wxBrush::wxBrush
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
RealizeResource();
}
#endif
wxBrush::wxBrush(const wxBitmap& rStipple)
{

2
src/os2/pen.cpp
View File

@@ -148,14 +148,12 @@ wxPen::wxPen(
RealizeResource();
} // end of wxPen::wxPen
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData(colour, width, (wxPenStyle)style);
RealizeResource();
}
#endif
wxPen::wxPen(
const wxBitmap& rStipple

2
src/osx/brush.cpp
View File

@@ -99,12 +99,10 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
m_refData = new wxBrushRefData( col, style );
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
}
#endif
wxBrush::wxBrush(const wxBitmap& stipple)
{

2
src/osx/pen.cpp
View File

@@ -111,7 +111,6 @@ wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
RealizeResource();
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& col, int Width, int Style)
{
m_refData = new wxPenRefData;
@@ -126,7 +125,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
RealizeResource();
}
#endif
wxPen::wxPen(const wxBitmap& stipple, int Width)
{

4
src/propgrid/editors.cpp
View File

@@ -1548,7 +1548,7 @@ void wxSimpleCheckBox::OnPaint( wxPaintEvent& WXUNUSED(event) )
int state = m_state;
if ( !(state & wxSCB_STATE_UNSPECIFIED) &&
GetFont().GetWeight() == wxBOLD )
GetFont().GetWeight() == wxFONTWEIGHT_BOLD )
state |= wxSCB_STATE_BOLD;
DrawSimpleCheckBox(dc, rect, m_boxHeight, state);
@@ -1648,7 +1648,7 @@ void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
if ( !property->IsValueUnspecified() )
{
state = property->GetChoiceSelection();
if ( dc.GetFont().GetWeight() == wxBOLD )
if ( dc.GetFont().GetWeight() == wxFONTWEIGHT_BOLD )
state |= wxSCB_STATE_BOLD;
}
else

2
src/richtext/richtextbackgroundpage.cpp
View File

@@ -117,7 +117,7 @@ void wxRichTextBackgroundPage::CreateControls()
itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW, 5);
wxStaticText* itemStaticText5 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Background"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText5->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText5->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine6 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

6
src/richtext/richtextborderspage.cpp
View File

@@ -230,7 +230,7 @@ void wxRichTextBordersPage::CreateControls()
wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer7->Add(itemBoxSizer8, 0, wxGROW, 5);
wxStaticText* itemStaticText9 = new wxStaticText( itemPanel5, wxID_STATIC, _("Border"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText9->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText9->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine10 = new wxStaticLine( itemPanel5, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -399,7 +399,7 @@ void wxRichTextBordersPage::CreateControls()
wxBoxSizer* itemBoxSizer51 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer50->Add(itemBoxSizer51, 0, wxGROW, 5);
wxStaticText* itemStaticText52 = new wxStaticText( itemPanel48, wxID_STATIC, _("Outline"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText52->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText52->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer51->Add(itemStaticText52, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine53 = new wxStaticLine( itemPanel48, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -567,7 +567,7 @@ void wxRichTextBordersPage::CreateControls()
wxBoxSizer* itemBoxSizer94 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer93->Add(itemBoxSizer94, 0, wxGROW, 5);
wxStaticText* itemStaticText95 = new wxStaticText( itemPanel91, wxID_STATIC, _("Corner"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText95->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText95->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer94->Add(itemStaticText95, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine96 = new wxStaticLine( itemPanel91, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

4
src/richtext/richtextmarginspage.cpp
View File

@@ -169,7 +169,7 @@ void wxRichTextMarginsPage::CreateControls()
itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW, 5);
wxStaticText* itemStaticText5 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Margins"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText5->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText5->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine6 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -283,7 +283,7 @@ void wxRichTextMarginsPage::CreateControls()
itemBoxSizer3->Add(itemBoxSizer28, 0, wxGROW, 5);
wxStaticText* itemStaticText29 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Padding"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText29->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText29->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer28->Add(itemStaticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine30 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

8
src/richtext/richtextsizepage.cpp
View File

@@ -225,7 +225,7 @@ void wxRichTextSizePage::CreateControls()
itemBoxSizer6->Add(itemBoxSizer7, 0, wxGROW, 5);
wxStaticText* itemStaticText8 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Floating"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText8->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText8->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer7->Add(itemStaticText8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine9 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -262,7 +262,7 @@ void wxRichTextSizePage::CreateControls()
m_alignmentSizer->Add(itemBoxSizer17, 0, wxGROW, 5);
wxStaticText* itemStaticText18 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Alignment"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText18->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText18->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine19 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -295,7 +295,7 @@ void wxRichTextSizePage::CreateControls()
m_parentSizer->Add(itemBoxSizer24, 0, wxGROW, 5);
wxStaticText* itemStaticText25 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Size"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText25->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText25->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer24->Add(itemStaticText25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine26 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -492,7 +492,7 @@ void wxRichTextSizePage::CreateControls()
m_positionControls->Add(itemBoxSizer59, 0, wxGROW, 5);
wxStaticText* itemStaticText60 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText60->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemStaticText60->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxFONTWEIGHT_BOLD));
itemBoxSizer59->Add(itemStaticText60, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine61 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

2
src/richtext/richtextsymboldlg.cpp
View File

@@ -556,7 +556,7 @@ void wxSymbolPickerDialog::UpdateSymbolDisplay(bool updateSymbolList, bool showA
if (!fontNameToUse.empty())
{
font = wxFont(14, wxDEFAULT, wxNORMAL, wxNORMAL, false, fontNameToUse);
font = wxFont(14, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, fontNameToUse);
}
else
font = *wxNORMAL_FONT;

4
src/stc/stc.cpp
View File

@@ -4217,8 +4217,8 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
#endif
int size = font.GetPointSize();
wxString faceName = font.GetFaceName();
bool bold = font.GetWeight() == wxBOLD;
bool italic = font.GetStyle() != wxNORMAL;
bool bold = font.GetWeight() == wxFONTWEIGHT_BOLD;
bool italic = font.GetStyle() != wxFONTSTYLE_NORMAL;
bool under = font.GetUnderlined();
wxFontEncoding encoding = font.GetEncoding();

2
src/x11/brush.cpp
View File

@@ -63,14 +63,12 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
M_BRUSHDATA->m_colour = colour;
}
#if WXWIN_COMPATIBILITY_3_0
wxBrush::wxBrush(const wxColour& col, int style)
{
m_refData = new wxBrushRefData;
M_BRUSHDATA->m_style = (wxBrushStyle)style;
M_BRUSHDATA->m_colour = col;
}
#endif
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{

2
src/x11/pen.cpp
View File

@@ -85,7 +85,6 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
M_PENDATA->m_colour = colour;
}
#if WXWIN_COMPATIBILITY_3_0
wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData();
@@ -93,7 +92,6 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
M_PENDATA->m_style = (wxPenStyle)style;
M_PENDATA->m_colour = colour;
}
#endif
wxPen::~wxPen()
{