mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-28 15:50:17 +08:00
wxQt: Fix some compilation warnings
This commit is contained in:
@@ -38,8 +38,8 @@ public:
|
||||
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) final;
|
||||
bool Create(int width, int height, const wxDC& dc);
|
||||
|
||||
virtual void SetScaleFactor(double scale);
|
||||
virtual double GetScaleFactor() const;
|
||||
virtual void SetScaleFactor(double scale) override;
|
||||
virtual double GetScaleFactor() const override;
|
||||
|
||||
virtual int GetHeight() const override;
|
||||
virtual int GetWidth() const override;
|
||||
|
||||
@@ -99,7 +99,7 @@ public:
|
||||
virtual int GetCharWidth() const override;
|
||||
virtual double GetContentScaleFactor() const override;
|
||||
|
||||
virtual wxSize GetDPI() const;
|
||||
virtual wxSize GetDPI() const override;
|
||||
virtual double GetDPIScaleFactor() const override;
|
||||
|
||||
virtual void SetScrollbar( int orient,
|
||||
|
||||
+2
-2
@@ -262,7 +262,7 @@ public:
|
||||
virtual wxTextCtrlHitTestResult
|
||||
HitTest(const wxPoint& pt, long* pos) const override
|
||||
{
|
||||
auto qtEdit = static_cast<wxQtTextEdit* const>(m_edit);
|
||||
auto qtEdit = static_cast<wxQtTextEdit*>(m_edit);
|
||||
|
||||
auto cursor = qtEdit->cursorForPosition( wxQtConvertPoint(pt) );
|
||||
auto curRect = qtEdit->cursorRect(cursor);
|
||||
@@ -544,7 +544,7 @@ public:
|
||||
virtual wxTextCtrlHitTestResult
|
||||
HitTest(const wxPoint& pt, long *pos) const override
|
||||
{
|
||||
auto qtEdit = static_cast<wxQtLineEdit* const>(m_edit);
|
||||
auto qtEdit = static_cast<wxQtLineEdit*>(m_edit);
|
||||
auto curPos = qtEdit->cursorPositionAt( wxQtConvertPoint(pt) );
|
||||
auto curRect = qtEdit->cursorRect();
|
||||
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
// Apparently {mouse,key}Event() functions signature has changed from QWidget to
|
||||
// QWindow at some time during Qt5. Fortunately, we can continue to use the API
|
||||
// taking QWidget by defining QT_WIDGETS_LIB before including the test headers.
|
||||
#ifndef QT_WIDGETS_LIB
|
||||
#define QT_WIDGETS_LIB
|
||||
#endif
|
||||
|
||||
#include <QtTest/QtTestGui>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
Reference in New Issue
Block a user