diff --git a/Core/GDCore/Events/Builtin/GroupEvent.cpp b/Core/GDCore/Events/Builtin/GroupEvent.cpp index cf4a37eb83..36cdd0ac20 100644 --- a/Core/GDCore/Events/Builtin/GroupEvent.cpp +++ b/Core/GDCore/Events/Builtin/GroupEvent.cpp @@ -132,7 +132,7 @@ void GroupEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::EventsE dc.SetTextBackground(backgroundColor); dc.SetTextForeground(textColor); - dc.SetFont( wxFont( 12, wxDEFAULT, wxNORMAL, wxFONTWEIGHT_BOLD ) ); + dc.SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); dc.DrawText( groupTitle, x+5, y + 5 ); #endif } @@ -148,7 +148,7 @@ unsigned int GroupEvent::GetRenderedHeight(unsigned int width, const gd::Platfor wxString groupTitle = name.empty() ? _("Untitled group") : wxString(name); - dc.SetFont( wxFont( 12, wxDEFAULT, wxNORMAL, wxNORMAL ) ); + dc.SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) ); wxRect text = dc.GetTextExtent(groupTitle); renderedHeight = text.GetHeight()+10; diff --git a/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp b/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp index 95eb892aef..37f74c794f 100644 --- a/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp @@ -203,72 +203,72 @@ lastErrorPos(gd::String::npos) Button5->SetToolTip(_("Tangent")); GridSizer2->Add(Button5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button21 = new wxButton(mathPanel, ID_BUTTON33, _("log10"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON33")); - wxFont Button21Font(6,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button21Font(6,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button21->SetFont(Button21Font); Button21->SetToolTip(_("Base-10 logarithm")); GridSizer2->Add(Button21, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button17 = new wxButton(mathPanel, ID_BUTTON29, _("cosh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON29")); - wxFont Button17Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button17Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button17->SetFont(Button17Font); Button17->SetToolTip(_("Hyperbolic cosine")); GridSizer2->Add(Button17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button16 = new wxButton(mathPanel, ID_BUTTON28, _("sinh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON28")); - wxFont Button16Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button16Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button16->SetFont(Button16Font); Button16->SetToolTip(_("Hyperbolic sine")); GridSizer2->Add(Button16, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button15 = new wxButton(mathPanel, ID_BUTTON27, _("tanh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON27")); - wxFont Button15Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button15Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button15->SetFont(Button15Font); Button15->SetToolTip(_("Hyperbolic tangent")); GridSizer2->Add(Button15, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button14 = new wxButton(mathPanel, ID_BUTTON26, _("floor"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON26")); - wxFont Button14Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button14Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button14->SetFont(Button14Font); Button14->SetToolTip(_("Round to the smallest following integer.")); GridSizer2->Add(Button14, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button7 = new wxButton(mathPanel, ID_BUTTON18, _("acos"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON18")); - wxFont Button7Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button7Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button7->SetFont(Button7Font); GridSizer2->Add(Button7, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button8 = new wxButton(mathPanel, ID_BUTTON19, _("asin"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON19")); - wxFont Button8Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button8Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button8->SetFont(Button8Font); GridSizer2->Add(Button8, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button9 = new wxButton(mathPanel, ID_BUTTON20, _("atan"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON20")); - wxFont Button9Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button9Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button9->SetFont(Button9Font); GridSizer2->Add(Button9, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); ceilBt = new wxButton(mathPanel, ID_BUTTON21, _("ceil"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON21")); ceilBt->SetToolTip(_("Round to the greatest following integer.")); GridSizer2->Add(ceilBt, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button10 = new wxButton(mathPanel, ID_BUTTON22, _("a\ncosh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON22")); - wxFont Button10Font(6,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button10Font(6,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button10->SetFont(Button10Font); GridSizer2->Add(Button10, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button11 = new wxButton(mathPanel, ID_BUTTON23, _("a\nsinh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON23")); - wxFont Button11Font(6,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button11Font(6,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button11->SetFont(Button11Font); GridSizer2->Add(Button11, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button12 = new wxButton(mathPanel, ID_BUTTON24, _("a\ntanh"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON24")); - wxFont Button12Font(6,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button12Font(6,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button12->SetFont(Button12Font); GridSizer2->Add(Button12, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); intBt = new wxButton(mathPanel, ID_BUTTON25, _("int"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON25")); intBt->SetToolTip(_("in(x) convert x in an integer.")); GridSizer2->Add(intBt, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button18 = new wxButton(mathPanel, ID_BUTTON30, _("sec"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON30")); - wxFont Button18Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button18Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button18->SetFont(Button18Font); Button18->SetToolTip(_("Secant ( 1/cos(x) )")); GridSizer2->Add(Button18, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button19 = new wxButton(mathPanel, ID_BUTTON31, _("csc"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON31")); - wxFont Button19Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button19Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button19->SetFont(Button19Font); Button19->SetToolTip(_("Cosecant ( 1/sin(x) )")); GridSizer2->Add(Button19, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Button20 = new wxButton(mathPanel, ID_BUTTON32, _("cot"), wxDefaultPosition, wxSize(25,23), 0, wxDefaultValidator, _T("ID_BUTTON32")); - wxFont Button20Font(7,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont Button20Font(7,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); Button20->SetFont(Button20Font); Button20->SetToolTip(_("Cotangent ( 1/tan(x) )")); GridSizer2->Add(Button20, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp b/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp index b828a64a7c..3dbc06ee62 100644 --- a/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp @@ -142,7 +142,7 @@ tempLayer(layer_) FlexGridSizer7->Add(FlexGridSizer9, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("For example, a camera which takes the left side of the window would be defined with 0, 0, 0.5, 1.\nBy default, a camera has a viewport which covers the entire window."), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, _T("ID_STATICTEXT3")); - wxFont StaticText3Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText3Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText3->SetFont(StaticText3Font); FlexGridSizer6->Add(StaticText3, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); StaticBoxSizer2->Add(FlexGridSizer6, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/Core/GDCore/IDE/Dialogs/EditLink.cpp b/Core/GDCore/IDE/Dialogs/EditLink.cpp index f0d035577b..000fb3ca0e 100644 --- a/Core/GDCore/IDE/Dialogs/EditLink.cpp +++ b/Core/GDCore/IDE/Dialogs/EditLink.cpp @@ -94,7 +94,7 @@ game(game_) StaticText5 = new wxStaticText(this, ID_STATICTEXT5, _("Remember to update the numbers of the events if\nyou delete or add events in the scene linked."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5")); wxFont StaticText5Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); if ( !StaticText5Font.Ok() ) StaticText5Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - StaticText5Font.SetStyle(wxITALIC); + StaticText5Font.SetStyle(wxFONTSTYLE_ITALIC); StaticText5->SetFont(StaticText5Font); FlexGridSizer1->Add(StaticText5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticLine1 = new wxStaticLine(this, ID_STATICLINE1, wxDefaultPosition, wxSize(10,-1), wxLI_HORIZONTAL, _T("ID_STATICLINE1")); diff --git a/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp b/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp index 8c806180af..607be230ef 100644 --- a/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp +++ b/Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp @@ -139,7 +139,7 @@ ProjectExtensionsDialog::ProjectExtensionsDialog(wxWindow* parent, gd::Project & authorTxt = new wxStaticText(this, ID_STATICTEXT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); wxFont authorTxtFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); if ( !authorTxtFont.Ok() ) authorTxtFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - authorTxtFont.SetWeight(wxBOLD); + authorTxtFont.SetWeight(wxFONTWEIGHT_BOLD); authorTxt->SetFont(authorTxtFont); FlexGridSizer8->Add(authorTxt, 1, wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer5->Add(FlexGridSizer8, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); @@ -151,7 +151,7 @@ ProjectExtensionsDialog::ProjectExtensionsDialog(wxWindow* parent, gd::Project & licenseTxt = new wxStaticText(this, ID_STATICTEXT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4")); wxFont licenseTxtFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); if ( !licenseTxtFont.Ok() ) licenseTxtFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - licenseTxtFont.SetWeight(wxBOLD); + licenseTxtFont.SetWeight(wxFONTWEIGHT_BOLD); licenseTxt->SetFont(licenseTxtFont); FlexGridSizer9->Add(licenseTxt, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer5->Add(FlexGridSizer9, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/Core/GDCore/IDE/wxTools/SkinHelper.cpp b/Core/GDCore/IDE/wxTools/SkinHelper.cpp index a035b49233..3a744272bd 100644 --- a/Core/GDCore/IDE/wxTools/SkinHelper.cpp +++ b/Core/GDCore/IDE/wxTools/SkinHelper.cpp @@ -149,7 +149,7 @@ void SkinHelper::ApplyCurrentSkin(wxAuiManager & auiManager) //DockArt skin wxAuiDefaultDockArt *dockArt = new wxAuiDefaultDockArt(); pConfig->Read( _T( "/Skin/Defined" ), &result ); - dockArt->SetFont(wxAUI_DOCKART_CAPTION_FONT, wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE)); + dockArt->SetFont(wxAUI_DOCKART_CAPTION_FONT, wxFont(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE)); if ( result == "true" ) { int r = 120, v = 120, b = 120; diff --git a/Core/wxsmith/ChooseObjectDialog.wxs b/Core/wxsmith/ChooseObjectDialog.wxs index 8a74367745..ce2b594121 100644 --- a/Core/wxsmith/ChooseObjectDialog.wxs +++ b/Core/wxsmith/ChooseObjectDialog.wxs @@ -71,7 +71,7 @@ - #ifdef ____WXMSW____ Menu1.Remove(editMenuItem); wxFont boldFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT); editMenuItem->SetFont(boldFont); Menu1.Append(editMenuItem); #endif + #ifdef ____WXMSW____ Menu1.Remove(editMenuItem); wxFont boldFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE__NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT); editMenuItem->SetFont(boldFont); Menu1.Append(editMenuItem); #endif @@ -82,7 +82,7 @@ - #ifdef ____WXMSW____ Menu2.Remove(editGroupMenuItem); wxFont boldFont2(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT); editGroupMenuItem->SetFont(boldFont2); Menu2.Append(editGroupMenuItem); #endif + #ifdef ____WXMSW____ Menu2.Remove(editGroupMenuItem); wxFont boldFont2(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE__NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT); editGroupMenuItem->SetFont(boldFont2); Menu2.Append(editGroupMenuItem); #endif diff --git a/Extensions/PanelSpriteObject/PanelSpriteObjectEditor.cpp b/Extensions/PanelSpriteObject/PanelSpriteObjectEditor.cpp index 90ef2fcabf..e2b601cb8c 100644 --- a/Extensions/PanelSpriteObject/PanelSpriteObjectEditor.cpp +++ b/Extensions/PanelSpriteObject/PanelSpriteObjectEditor.cpp @@ -130,7 +130,7 @@ object(object_) FlexGridSizer11->Add(leftMarginTextCtrl, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); GridSizer1->Add(FlexGridSizer11, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText5 = new wxStaticText(Core, ID_STATICTEXT5, _("Image center\n(streched part)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5")); - wxFont StaticText5Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText5Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText5->SetFont(StaticText5Font); GridSizer1->Add(StaticText5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer12 = new wxFlexGridSizer(0, 1, 0, 0); diff --git a/Extensions/PathBehavior/PathBehaviorEditor.cpp b/Extensions/PathBehavior/PathBehaviorEditor.cpp index be8a2492f4..9d9fe7e44d 100644 --- a/Extensions/PathBehavior/PathBehaviorEditor.cpp +++ b/Extensions/PathBehavior/PathBehaviorEditor.cpp @@ -251,7 +251,7 @@ PathBehaviorEditor::PathBehaviorEditor(wxWindow* parent, gd::Project & game_, gd StaticBoxSizer1->Add(FlexGridSizer4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer11->Add(StaticBoxSizer1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText9 = new wxStaticText(this, ID_STATICTEXT10, _("These parameters are independent from the path."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT10")); - wxFont StaticText9Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText9Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText9->SetFont(StaticText9Font); FlexGridSizer11->Add(StaticText9, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer10->Add(FlexGridSizer11, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/Extensions/PhysicsBehavior/CustomPolygonDialog.cpp b/Extensions/PhysicsBehavior/CustomPolygonDialog.cpp index 42b9d9487d..c3207435e6 100644 --- a/Extensions/PhysicsBehavior/CustomPolygonDialog.cpp +++ b/Extensions/PhysicsBehavior/CustomPolygonDialog.cpp @@ -96,7 +96,7 @@ CustomPolygonDialog::CustomPolygonDialog(wxWindow* parent, std::vectorSetMaxSize(wxSize(-1,120)); FlexGridSizer5->Add(pointsEdit, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Coordinates must be entered clockwise."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2")); - wxFont StaticText2Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText2Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText2->SetFont(StaticText2Font); FlexGridSizer5->Add(StaticText2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Positioning")); @@ -116,7 +116,7 @@ CustomPolygonDialog::CustomPolygonDialog(wxWindow* parent, std::vectorAdd(autoResizingCheckBox, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText3 = new wxStaticText(this, ID_STATICTEXT5, _("So as to let the polygon resize itself according to the object size, you must define the initial size of the object."), wxDefaultPosition, wxSize(291,47), wxST_NO_AUTORESIZE, _T("ID_STATICTEXT5")); StaticText3->Disable(); - wxFont StaticText3Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText3Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText3->SetFont(StaticText3Font); FlexGridSizer9->Add(StaticText3, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer10 = new wxFlexGridSizer(0, 4, 0, 0); @@ -172,11 +172,11 @@ CustomPolygonDialog::CustomPolygonDialog(wxWindow* parent, std::vectorAdd(FlexGridSizer8, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0); pointLabelTxt = new wxStaticText(this, ID_STATICTEXT4, _("The point indicates the origin of the object."), wxDefaultPosition, wxSize(277,13), 0, _T("ID_STATICTEXT4")); - wxFont pointLabelTxtFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont pointLabelTxtFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); pointLabelTxt->SetFont(pointLabelTxtFont); FlexGridSizer7->Add(pointLabelTxt, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); cursorPosTxt = new wxStaticText(this, ID_STATICTEXT3, _("Cursor position:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); - wxFont cursorPosTxtFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont cursorPosTxtFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); cursorPosTxt->SetFont(cursorPosTxtFont); FlexGridSizer7->Add(cursorPosTxt, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/Extensions/SoundObject/SoundObjectEditor.cpp b/Extensions/SoundObject/SoundObjectEditor.cpp index 911b351324..501fe20e62 100644 --- a/Extensions/SoundObject/SoundObjectEditor.cpp +++ b/Extensions/SoundObject/SoundObjectEditor.cpp @@ -96,11 +96,11 @@ object(object_) StaticBoxSizer3 = new wxStaticBoxSizer(wxHORIZONTAL, Panel1, _("Note")); FlexGridSizer8 = new wxFlexGridSizer(0, 1, 0, 0); StaticText6 = new wxStaticText(Panel1, ID_STATICTEXT6, _("\"Music\" mode is more appropriate for long sound file, during more than 10 seconds:\nThe sound file is only partially loaded in memory when it is played.\n\"Sound\" mode is to be used with smaller sound file, as the sound files are in this case\ntotally loaded into the memory."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT6")); - wxFont StaticText6Font(8,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText6Font(8,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText6->SetFont(StaticText6Font); FlexGridSizer8->Add(StaticText6, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText7 = new wxStaticText(Panel1, ID_STATICTEXT7, _("Sound spatialisation is only available for \"mono\" sound ( and not stereo ones )."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT7")); - wxFont StaticText7Font(8,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText7Font(8,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText7->SetFont(StaticText7Font); FlexGridSizer8->Add(StaticText7, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticBoxSizer3->Add(FlexGridSizer8, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); diff --git a/GDCpp/GDCpp/IDE/Dialogs/CompilationErrorDialog.cpp b/GDCpp/GDCpp/IDE/Dialogs/CompilationErrorDialog.cpp index 7513c20b3c..2d4d89d274 100644 --- a/GDCpp/GDCpp/IDE/Dialogs/CompilationErrorDialog.cpp +++ b/GDCpp/GDCpp/IDE/Dialogs/CompilationErrorDialog.cpp @@ -70,7 +70,7 @@ CompilationErrorDialog::CompilationErrorDialog(wxWindow* parent, gd::String repo FlexGridSizer2->Add(StaticLine1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); FlexGridSizer3 = new wxFlexGridSizer(0, 1, 0, 0); StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("How solve the problem \?"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2")); - wxFont StaticText2Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText2Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText2->SetFont(StaticText2Font); FlexGridSizer3->Add(StaticText2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("A problem when copying a known file:\n -Check that your file (image, sound ...) exists.\n -Check you have read/write permission. \n\nA problem when copying a file unknown:\n -Check that the file in question exists. \n If not, try reinstalling GDevelop\n -Check you have read/write permission.\n\nA problem when creating a file:\n -Make sure you have read/write\n permission."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); @@ -82,7 +82,7 @@ CompilationErrorDialog::CompilationErrorDialog(wxWindow* parent, gd::String repo FlexGridSizer4 = new wxFlexGridSizer(0, 3, 0, 0); FlexGridSizer4->AddGrowableCol(0); StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("If you can not solve the problem, do not hesitate to contact us"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4")); - wxFont StaticText4Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_ITALIC,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText4Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_ITALIC,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText4->SetFont(StaticText4Font); FlexGridSizer4->Add(StaticText4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FermerBt = new wxButton(this, ID_BUTTON2, _("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON2")); diff --git a/GDCpp/GDCpp/IDE/Dialogs/ProfileDlg.cpp b/GDCpp/GDCpp/IDE/Dialogs/ProfileDlg.cpp index 7fa8fa3096..0a5c8418c1 100644 --- a/GDCpp/GDCpp/IDE/Dialogs/ProfileDlg.cpp +++ b/GDCpp/GDCpp/IDE/Dialogs/ProfileDlg.cpp @@ -195,7 +195,7 @@ void ProfileDlg::OnratioGraphicsPaint(wxPaintEvent& event) dc.SetBackgroundMode( wxBG_STYLE_COLOUR ); wxColour backgroundColor( wxColour( 250, 250, 250 ) ); dc.SetBackground( backgroundColor ); - dc.SetFont( wxFont( 8, wxDEFAULT, wxNORMAL, wxNORMAL ) ); + dc.SetFont( wxFont( 8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) ); dc.SetTextForeground( wxColour( 0, 0, 0 ) ); //Background diff --git a/IDE/BuildProgressPnl.cpp b/IDE/BuildProgressPnl.cpp index 52a281603d..9bc4061887 100644 --- a/IDE/BuildProgressPnl.cpp +++ b/IDE/BuildProgressPnl.cpp @@ -39,7 +39,7 @@ clearOnNextTextAdding(true) FlexGridSizer1->AddGrowableCol(0); FlexGridSizer1->AddGrowableRow(2); statusTxt = new wxStaticText(this, ID_STATICTEXT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1")); - wxFont statusTxtFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont statusTxtFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); statusTxt->SetFont(statusTxtFont); FlexGridSizer1->Add(statusTxt, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); progressGauge = new wxGauge(this, ID_GAUGE1, 100, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_GAUGE1")); diff --git a/IDE/Credits.cpp b/IDE/Credits.cpp index 4323ae64c8..92a9bcc56d 100644 --- a/IDE/Credits.cpp +++ b/IDE/Credits.cpp @@ -87,7 +87,7 @@ Credits::Credits(wxWindow* parent) FlexGridSizer3->AddGrowableCol(0); StaticText1 = new wxStaticText(Panel1, ID_STATICTEXT1, _("GDevelop"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT1")); StaticText1->SetMinSize(wxSize(-1,-1)); - wxFont StaticText1Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText1Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText1->SetFont(StaticText1Font); FlexGridSizer3->Add(StaticText1, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); StaticText4 = new wxStaticText(Panel1, ID_STATICTEXT4, _("was created by"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT4")); diff --git a/IDE/Dialogs/ReminderDialog.cpp b/IDE/Dialogs/ReminderDialog.cpp index e6fed876eb..0e732d11cb 100644 --- a/IDE/Dialogs/ReminderDialog.cpp +++ b/IDE/Dialogs/ReminderDialog.cpp @@ -54,7 +54,7 @@ ReminderDialog::ReminderDialog(wxWindow* parent,wxWindowID id,const wxPoint& pos FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0); FlexGridSizer1->AddGrowableRow(2); StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Thank you for using GDevelop!"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1")); - wxFont StaticText1Font(13,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText1Font(13,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText1->SetFont(StaticText1Font); FlexGridSizer1->Add(StaticText1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer7 = new wxFlexGridSizer(0, 1, 0, 0); diff --git a/IDE/Dialogs/StartHerePage.cpp b/IDE/Dialogs/StartHerePage.cpp index 3073bcbfad..9447842b57 100644 --- a/IDE/Dialogs/StartHerePage.cpp +++ b/IDE/Dialogs/StartHerePage.cpp @@ -15,7 +15,7 @@ StartHerePage::StartHerePage(wxWindow* parent, MainFrame & mainEditor_) : BaseStartHerePage(parent), mainEditor(mainEditor_) { - wxFont titleFont(13,wxDEFAULT,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont titleFont(13,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); gettingStartedTxt->SetFont(titleFont); communityTxt->SetFont(titleFont); newsTxt->SetFont(titleFont); diff --git a/IDE/EditPropScene.cpp b/IDE/EditPropScene.cpp index d077a8b71b..78a0c1401e 100644 --- a/IDE/EditPropScene.cpp +++ b/IDE/EditPropScene.cpp @@ -77,7 +77,7 @@ EditPropScene::EditPropScene(wxWindow* parent, gd::Layout & layout_) : FlexGridSizer10 = new wxFlexGridSizer(0, 2, 0, 0); FlexGridSizer10->AddGrowableCol(0); StaticText9 = new wxStaticText(this, ID_STATICTEXT4, _("Basic properties"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4")); - wxFont StaticText9Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText9Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText9->SetFont(StaticText9Font); FlexGridSizer10->Add(StaticText9, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer10->Add(20,8,1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -107,7 +107,7 @@ EditPropScene::EditPropScene(wxWindow* parent, gd::Layout & layout_) : stableSortCheck = new wxRadioButton(this, ID_RADIOBUTTON2, _("Stable sort (slower but less \"flickering\")"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2")); FlexGridSizer10->Add(stableSortCheck, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("Advanced"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); - wxFont StaticText3Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText3Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText3->SetFont(StaticText3Font); FlexGridSizer10->Add(StaticText3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer10->Add(20,8,1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); diff --git a/IDE/ExtensionBugReportDlg.cpp b/IDE/ExtensionBugReportDlg.cpp index 3b4a58047e..7bf244a278 100644 --- a/IDE/ExtensionBugReportDlg.cpp +++ b/IDE/ExtensionBugReportDlg.cpp @@ -48,7 +48,7 @@ ExtensionBugReportDlg::ExtensionBugReportDlg(wxWindow* parent, wxString extensio StaticBitmap1 = new wxStaticBitmap(Panel1, ID_STATICBITMAP1, wxBitmap(wxImage(_T("res/bigextensionbug.png"))), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICBITMAP1")); FlexGridSizer2->Add(StaticBitmap1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StaticText1 = new wxStaticText(Panel1, ID_STATICTEXT1, _("An extension seems to be incompatible and make GDevelop crashing."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT1")); - wxFont StaticText1Font(11,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText1Font(11,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText1->SetFont(StaticText1Font); FlexGridSizer2->Add(StaticText1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); Panel1->SetSizer(FlexGridSizer2); @@ -62,12 +62,12 @@ ExtensionBugReportDlg::ExtensionBugReportDlg(wxWindow* parent, wxString extensio errorTxt = new wxStaticText(this, ID_STATICTEXT5, _("GDevelop crashed while loading this file:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5")); FlexGridSizer6->Add(errorTxt, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); fileTxt = new wxStaticText(this, ID_STATICTEXT2, _("Unknown file"), wxDefaultPosition, wxSize(159,13), 0, _T("ID_STATICTEXT2")); - wxFont fileTxtFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont fileTxtFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); fileTxt->SetFont(fileTxtFont); FlexGridSizer6->Add(fileTxt, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer3->Add(FlexGridSizer6, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("To launch GDevelop without errors,\ndelete the file from the extension and relaunch GDevelop."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); - wxFont StaticText3Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText3Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText3->SetFont(StaticText3Font); FlexGridSizer3->Add(StaticText3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("Report the problem to the extension's developer if possible."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4")); diff --git a/IDE/InstructionSelectorDialog.cpp b/IDE/InstructionSelectorDialog.cpp index 961e01c8ae..e00baa06e7 100644 --- a/IDE/InstructionSelectorDialog.cpp +++ b/IDE/InstructionSelectorDialog.cpp @@ -119,7 +119,7 @@ InstructionSelectorDialog::InstructionSelectorDialog(wxWindow* parent, gd::Proje FlexGridSizer3->Add(ActionImg, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); BoxSizer4 = new wxBoxSizer(wxHORIZONTAL); instructionNameTxt = new wxStaticText(this, ID_STATICTEXT1, editingAction ? _("No action chosen") : _("No condition chosen"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1")); - wxFont instructionNameTxtFont(16,wxSWISS,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont instructionNameTxtFont(16,wxFONTFAMILY_SWISS,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); instructionNameTxt->SetFont(instructionNameTxtFont); BoxSizer4->Add(instructionNameTxt, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer3->Add(BoxSizer4, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/IDE/MAJ.cpp b/IDE/MAJ.cpp index 22dbf36d86..eda2aba5a0 100644 --- a/IDE/MAJ.cpp +++ b/IDE/MAJ.cpp @@ -71,7 +71,7 @@ parent(parent_) StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Your version :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2")); FlexGridSizer2->Add(StaticText2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); versionTxt = new wxStaticText(this, ID_STATICTEXT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3")); - wxFont versionTxtFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont versionTxtFont(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); versionTxt->SetFont(versionTxtFont); FlexGridSizer2->Add(versionTxt, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("Available version :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4")); @@ -82,7 +82,7 @@ parent(parent_) FlexGridSizer6 = new wxFlexGridSizer(0, 3, 0, 0); FlexGridSizer6->AddGrowableCol(0); StaticText1 = new wxStaticText(this, ID_STATICTEXT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1")); - wxFont StaticText1Font(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); + wxFont StaticText1Font(wxDEFAULT,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT); StaticText1->SetFont(StaticText1Font); FlexGridSizer6->Add(StaticText1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer1->Add(FlexGridSizer6, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/IDE/wxstedit/src/stestyls.cpp b/IDE/wxstedit/src/stestyls.cpp index 0c9dd8318f..838233f7b7 100644 --- a/IDE/wxstedit/src/stestyls.cpp +++ b/IDE/wxstedit/src/stestyls.cpp @@ -309,31 +309,31 @@ int wxSTEditorStyles::GetBackgroundColourInt(int style_n, bool use_default) cons } wxFont wxSTEditorStyles::GetFont(int style_n, bool use_default) const { - wxCHECK_MSG(Ok(), wxFont(STE_DEF_FONTSIZE, wxMODERN, wxNORMAL, wxNORMAL), wxT("Styles not created")); + wxCHECK_MSG(Ok(), wxFont(STE_DEF_FONTSIZE, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL), wxT("Styles not created")); /* wxFont *f = wxTheFontList->FindOrCreateFont( GetSize(style_n, use_default), - wxMODERN, // unused using facename - GetItalic(style_n, use_default) ? wxITALIC : wxNORMAL, - GetBold(style_n, use_default) ? wxBOLD : wxNORMAL, + wxFONTFAMILY_MODERN, // unused using facename + GetItalic(style_n, use_default) ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL, + GetBold(style_n, use_default) ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL, GetUnderlined(style_n, use_default), GetFaceName(style_n, use_default)); if (!f || !f->Ok()) - return wxFont(STE_DEF_FONTSIZE, wxMODERN, wxNORMAL, wxNORMAL); + return wxFont(STE_DEF_FONTSIZE, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); return wxFont(*f); */ wxFont font(GetSize(style_n, use_default), - wxMODERN, // unused using facename - GetItalic(style_n, use_default) ? wxITALIC : wxNORMAL, - GetBold(style_n, use_default) ? wxBOLD : wxNORMAL, + wxFONTFAMILY_MODERN, // unused using facename + GetItalic(style_n, use_default) ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL, + GetBold(style_n, use_default) ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL, GetUnderlined(style_n, use_default), GetFaceName(style_n, use_default)); if (!font.Ok()) // oops this font works though - return wxFont(STE_DEF_FONTSIZE, wxMODERN, wxNORMAL, wxNORMAL); + return wxFont(STE_DEF_FONTSIZE, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); return font; } @@ -442,9 +442,9 @@ void wxSTEditorStyles::SetFont(int style_n, const wxFont &font) SetFaceName(style_n, font.GetFaceName()); SetSize(style_n, font.GetPointSize()); - int ste_font_attr = font.GetWeight() == wxBOLD ? STE_STYLE_FONT_BOLD : 0; - ste_font_attr |= font.GetStyle() != wxNORMAL ? STE_STYLE_FONT_ITALIC : 0; - ste_font_attr |= font.GetUnderlined() ? STE_STYLE_FONT_UNDERLINED : 0; + int ste_font_attr = font.GetWeight() == wxFONTWEIGHT_BOLD ? STE_STYLE_FONT_BOLD : 0; + ste_font_attr |= font.GetStyle() != wxFONTSTYLE_NORMAL ? STE_STYLE_FONT_ITALIC : 0; + ste_font_attr |= font.GetUnderlined() ? STE_STYLE_FONT_UNDERLINED : 0; SetFontAttr(style_n, ste_font_attr); }