committed by
Vadim Zeitlin
parent
5551932c25
commit
d639e4ffce
@@ -76,7 +76,7 @@ public:
|
|||||||
virtual int GetBase() const wxOVERRIDE { return m_base; }
|
virtual int GetBase() const wxOVERRIDE { return m_base; }
|
||||||
virtual bool SetBase(int base) wxOVERRIDE;
|
virtual bool SetBase(int base) wxOVERRIDE;
|
||||||
virtual void SetValue(const wxString & val);
|
virtual void SetValue(const wxString & val);
|
||||||
virtual void SetValue(int val) { wxSpinCtrlQt::SetValue(val); }
|
virtual void SetValue(int val) { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Common part of all ctors.
|
// Common part of all ctors.
|
||||||
@@ -118,7 +118,7 @@ public:
|
|||||||
virtual int GetBase() const wxOVERRIDE { return 10; }
|
virtual int GetBase() const wxOVERRIDE { return 10; }
|
||||||
virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
|
virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
|
||||||
virtual void SetValue(const wxString & val);
|
virtual void SetValue(const wxString & val);
|
||||||
virtual void SetValue(double val) { wxSpinCtrlQt::SetValue(val); }
|
virtual void SetValue(double val) { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
|
wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
|
||||||
|
@@ -25,6 +25,7 @@
|
|||||||
#define cairo_public
|
#define cairo_public
|
||||||
|
|
||||||
#include <cairo.h>
|
#include <cairo.h>
|
||||||
|
#include <float.h>
|
||||||
|
|
||||||
bool wxCairoInit();
|
bool wxCairoInit();
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@ class wxQtColorDialog : public wxQtEventSignalHandler< QColorDialog, wxDialog >
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxQtColorDialog( wxWindow *parent, wxDialog *handler)
|
wxQtColorDialog( wxWindow *parent, wxDialog *handler)
|
||||||
: wxQtEventSignalHandler(parent, handler)
|
: wxQtEventSignalHandler<QColorDialog,wxDialog>(parent, handler)
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@ public:
|
|||||||
wxQtFileDialog( wxWindow *parent, wxDialog *handler,
|
wxQtFileDialog( wxWindow *parent, wxDialog *handler,
|
||||||
const wxString& message, const wxString& defaultDir,
|
const wxString& message, const wxString& defaultDir,
|
||||||
const wxString& defaultFile, const wxString& wildCard, long style )
|
const wxString& defaultFile, const wxString& wildCard, long style )
|
||||||
: wxQtEventSignalHandler(parent, handler)
|
: wxQtEventSignalHandler<QFileDialog,wxDialog>(parent, handler)
|
||||||
{
|
{
|
||||||
setLabelText(QFileDialog::LookIn, wxQtConvertString(message));
|
setLabelText(QFileDialog::LookIn, wxQtConvertString(message));
|
||||||
setDirectory(wxQtConvertString(defaultDir));
|
setDirectory(wxQtConvertString(defaultDir));
|
||||||
|
@@ -15,7 +15,7 @@ class wxQtFontDialog : public wxQtEventSignalHandler< QFontDialog, wxFontDialog
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxQtFontDialog( wxWindow *parent, wxFontDialog *handler)
|
wxQtFontDialog( wxWindow *parent, wxFontDialog *handler)
|
||||||
: wxQtEventSignalHandler(parent, handler)
|
: wxQtEventSignalHandler<QFontDialog,wxFontDialog>(parent, handler)
|
||||||
{
|
{
|
||||||
connect(this, &QFontDialog::currentFontChanged, this, &wxQtFontDialog::updateFont);
|
connect(this, &QFontDialog::currentFontChanged, this, &wxQtFontDialog::updateFont);
|
||||||
}
|
}
|
||||||
|
@@ -16,7 +16,7 @@ class wxQtGLWidget : public wxQtEventSignalHandler< QGLWidget, wxGLCanvas >
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
|
wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
|
||||||
: wxQtEventSignalHandler(parent, handler)
|
: wxQtEventSignalHandler<QGLWidget,wxGLCanvas>(parent, handler)
|
||||||
{
|
{
|
||||||
setFormat(format);
|
setFormat(format);
|
||||||
setAutoBufferSwap( false );
|
setAutoBufferSwap( false );
|
||||||
|
Reference in New Issue
Block a user