fixed wxFontDialog API: accept const ref instead of (well, in addition to) a possibly NULL pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,28 +16,25 @@
|
||||
#pragma interface "fontdlg.h"
|
||||
#endif
|
||||
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/cmndata.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontDialog
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxFontDialog : public wxDialog
|
||||
class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
|
||||
{
|
||||
public:
|
||||
wxFontDialog();
|
||||
wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
|
||||
|
||||
bool Create(wxWindow *parent, wxFontData *data = NULL);
|
||||
wxFontDialog() : wxFontDialogBase() { }
|
||||
wxFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { }
|
||||
wxFontDialog(wxWindow *parent, const wxFontData& data)
|
||||
: wxFontDialogBase(parent, data) { }
|
||||
|
||||
virtual int ShowModal();
|
||||
|
||||
wxFontData& GetFontData() { return m_fontData; }
|
||||
// deprecated
|
||||
wxFontDialog(wxWindow *parent, wxFontData *data)
|
||||
: wxFontDialogBase(parent, data) { }
|
||||
|
||||
protected:
|
||||
wxFontData m_fontData;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxFontDialog)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user