diff --git a/common/include/Utilities/wxGuiTools.h b/common/include/Utilities/wxGuiTools.h
index 39aa1589d1..4892eefb47 100644
--- a/common/include/Utilities/wxGuiTools.h
+++ b/common/include/Utilities/wxGuiTools.h
@@ -702,18 +702,18 @@ public:
 		return *this;
 	}
 
-	pxWindowTextWriter& SetWeight( int weight );
-	pxWindowTextWriter& SetStyle( int style );
+	pxWindowTextWriter& SetWeight( wxFontWeight weight );
+	pxWindowTextWriter& SetStyle( wxFontStyle style );
 	pxWindowTextWriter& Normal();
 
 	pxWindowTextWriter& Bold()
 	{
-		return SetWeight(wxBOLD);
+		return SetWeight(wxFONTWEIGHT_BOLD);
 	}
 
 	pxWindowTextWriter& Italic()
 	{
-		return SetStyle(wxITALIC);
+		return SetStyle(wxFONTSTYLE_ITALIC);
 	}
 
 	pxWindowTextWriter& SetPos( const wxPoint& pos );
@@ -801,7 +801,7 @@ extern int pxGetCharHeight( const wxWindow& wind, int rows=1 );
 
 extern void pxSetToolTip( wxWindow* wind, const wxString& src );
 extern void pxSetToolTip( wxWindow& wind, const wxString& src );
-extern wxFont pxGetFixedFont( int ptsize=8, int weight=wxNORMAL );
+extern wxFont pxGetFixedFont( int ptsize = 8, wxFontWeight weight = wxFONTWEIGHT_NORMAL );
 
 extern pxDialogCreationFlags pxDialogFlags();
 
diff --git a/common/src/Utilities/pxRadioPanel.cpp b/common/src/Utilities/pxRadioPanel.cpp
index c863b7a2f7..16e8e93171 100644
--- a/common/src/Utilities/pxRadioPanel.cpp
+++ b/common/src/Utilities/pxRadioPanel.cpp
@@ -141,8 +141,8 @@ void pxRadioPanel::_RealizeDefaultOption()
 	if( m_IsRealized && m_DefaultIdx != -1 )
 	{
 		wxFont def( GetFont() );
-		def.SetWeight( wxBOLD );
-		//def.SetStyle( wxITALIC );
+		def.SetWeight( wxFONTWEIGHT_BOLD );
+		//def.SetStyle( wxFONTSTYLE_ITALIC );
 		m_objects[m_DefaultIdx].LabelObj->SetFont( def );
 		m_objects[m_DefaultIdx].LabelObj->SetForegroundColour( wxColour( 20, 128, 40 ) );
 	}
diff --git a/common/src/Utilities/pxStaticText.cpp b/common/src/Utilities/pxStaticText.cpp
index b3faf78b12..f16d77c292 100644
--- a/common/src/Utilities/pxStaticText.cpp
+++ b/common/src/Utilities/pxStaticText.cpp
@@ -99,7 +99,7 @@ pxStaticText& pxStaticText::Align( wxAlignment align )
 pxStaticText& pxStaticText::Bold()
 {
 	wxFont bold( GetFont() );
-	bold.SetWeight(wxBOLD);
+	bold.SetWeight(wxFONTWEIGHT_BOLD);
 	SetFont( bold );
 	return *this;
 }
diff --git a/common/src/Utilities/pxWindowTextWriter.cpp b/common/src/Utilities/pxWindowTextWriter.cpp
index 40daef0e5f..c583e374d9 100644
--- a/common/src/Utilities/pxWindowTextWriter.cpp
+++ b/common/src/Utilities/pxWindowTextWriter.cpp
@@ -33,7 +33,7 @@ void pxWindowTextWriter::OnFontChanged()
 {
 }
 
-pxWindowTextWriter& pxWindowTextWriter::SetWeight( int weight )
+pxWindowTextWriter& pxWindowTextWriter::SetWeight( wxFontWeight weight )
 {
 	wxFont curfont( m_dc.GetFont() );
 	curfont.SetWeight( weight );
@@ -42,7 +42,7 @@ pxWindowTextWriter& pxWindowTextWriter::SetWeight( int weight )
 	return *this;
 }
 
-pxWindowTextWriter& pxWindowTextWriter::SetStyle( int style )
+pxWindowTextWriter& pxWindowTextWriter::SetStyle( wxFontStyle style )
 {
 	wxFont curfont( m_dc.GetFont() );
 	curfont.SetStyle( style );
@@ -53,8 +53,8 @@ pxWindowTextWriter& pxWindowTextWriter::SetStyle( int style )
 pxWindowTextWriter& pxWindowTextWriter::Normal()
 {
 	wxFont curfont( m_dc.GetFont() );
-	curfont.SetStyle( wxNORMAL );
-	curfont.SetWeight( wxNORMAL );
+	curfont.SetStyle( wxFONTWEIGHT_NORMAL );
+	curfont.SetWeight( wxFONTSTYLE_NORMAL );
 	m_dc.SetFont( curfont );
 
 	return *this;
diff --git a/common/src/Utilities/wxGuiTools.cpp b/common/src/Utilities/wxGuiTools.cpp
index 073f4672f2..afbfb9ae97 100644
--- a/common/src/Utilities/wxGuiTools.cpp
+++ b/common/src/Utilities/wxGuiTools.cpp
@@ -593,10 +593,10 @@ void pxSetToolTip( wxWindow& wind, const wxString& src )
 }
 
 
-wxFont pxGetFixedFont( int ptsize, int weight )
+wxFont pxGetFixedFont( int ptsize, wxFontWeight weight )
 {
 	return wxFont(
-		ptsize, wxMODERN, wxNORMAL, weight, false
+		ptsize, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, weight, false
 #ifdef __WXMSW__
 		,L"Lucida Console"		// better than courier new (win32 only)
 #endif
diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp
index c601d8e6af..34730b08d0 100644
--- a/pcsx2/gui/ConsoleLogger.cpp
+++ b/pcsx2/gui/ConsoleLogger.cpp
@@ -167,10 +167,10 @@ ConsoleLogFrame::ColorArray::~ColorArray() throw()
 void ConsoleLogFrame::ColorArray::SetFont( int fontsize )
 {
 	const wxFont fixed( pxGetFixedFont( fontsize ) );
-	const wxFont fixedB( pxGetFixedFont( fontsize+1, wxBOLD ) );
+	const wxFont fixedB( pxGetFixedFont( fontsize+1, wxFONTWEIGHT_BOLD ) );
 
-	//const wxFont fixed( fontsize, wxMODERN, wxNORMAL, wxNORMAL );
-	//const wxFont fixedB( fontsize, wxMODERN, wxNORMAL, wxBOLD );
+	//const wxFont fixed( fontsize, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL );
+	//const wxFont fixedB( fontsize, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD );
 
 	// Standard R, G, B format:
 	for (size_t i = 0; i < Color_StrongBlack; ++i)
diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp
index e44df5c55f..a9f0ffb6fd 100644
--- a/pcsx2/gui/FrameForGS.cpp
+++ b/pcsx2/gui/FrameForGS.cpp
@@ -430,7 +430,7 @@ GSFrame::GSFrame( const wxString& title)
 
 	wxStaticText* label = new wxStaticText( this, wxID_ANY, _("GS Output is Disabled!") );
 	m_id_OutputDisabled = label->GetId();
-	label->SetFont( wxFont( 20, wxDEFAULT, wxNORMAL, wxBOLD ) );
+	label->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
 	label->SetForegroundColour( *wxWHITE );
 
 	AppStatusEvent_OnSettingsApplied();
diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
index 24d9a4b1ce..ab4f989f3e 100644
--- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
@@ -105,7 +105,7 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow* parent )
 		_("Select folder with PS2 BIOS roms")		// dir picker popup label
 	);
 
-	m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL, false, L"Lucida Console" ) );
+	m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Lucida Console" ) );
 	m_ComboBox->SetMinSize( wxSize( wxDefaultCoord, std::max( m_ComboBox->GetMinSize().GetHeight(), 96 ) ) );
 	
 	//if (InstallationMode != InstallMode_Portable)
diff --git a/pcsx2/gui/Panels/ThemeSelectorPanel.cpp b/pcsx2/gui/Panels/ThemeSelectorPanel.cpp
index 187ee198a3..a310da55a8 100644
--- a/pcsx2/gui/Panels/ThemeSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/ThemeSelectorPanel.cpp
@@ -39,7 +39,7 @@ Panels::ThemeSelectorPanel::ThemeSelectorPanel( wxWindow* parent )
 		_("Select folder containing PCSX2 visual themes")	// dir picker popup label
 		);
 
-	m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL, false, L"Lucida Console" ) );
+	m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Lucida Console" ) );
 	m_ComboBox->SetMinSize( wxSize( wxDefaultCoord, std::max( m_ComboBox->GetMinSize().GetHeight(), 96 ) ) );
 
 	if (InstallationMode != InstallMode_Portable)