Upgrade WX to r74856, mainly to support @2x.

This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions

View File

@ -3,13 +3,12 @@
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
// RCS-ID: $Id: fontdlg.h 67254 2011-03-20 00:14:35Z DS $
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTK_FONTDLGH__
#define __GTK_FONTDLGH__
#ifndef _WX_GTK_FONTDLG_H_
#define _WX_GTK_FONTDLG_H_
//-----------------------------------------------------------------------------
// wxFontDialog
@ -26,9 +25,6 @@ public:
virtual ~wxFontDialog();
// implementation only
void SetChosenFont(const char *name);
#if WXWIN_COMPATIBILITY_2_6
// deprecated interface, don't use
wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
@ -38,7 +34,6 @@ protected:
// create the GTK dialog
virtual bool DoCreate(wxWindow *parent);
private:
DECLARE_DYNAMIC_CLASS(wxFontDialog)
};