Remove unnecessary empty destructors
These cause a problem for GCC 14 which detects that there are no
corresponding copy constructors and assignment operators and gives
-Wdeprecated-copy-dtor due to their presence, e.g.
/home/fedora/swt2c/wxWidgets/bld/bk-deps g++ -c -o test_allheaders_allheaders.o -I/home/fedora/swt2c/wxWidgets/bld/lib/wx/include/gtk3-unicode-3.3 -I../../include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/at-spi2-atk/2.0 -I/usr/include/cloudproviders -I/usr/include/webp -I/usr/include/blkid -I/usr/include/at-spi-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/pixman-1 -I/usr/include/libxml2 -I/usr/include/fribidi -I/usr/include/sysprof-6 -pthread -I/usr/include/libpng16 -DWITH_GZFILEOP -D__WXGTK__ -I../../tests -DWXUSINGDLL -I../../tests/../samples -I../../3rdparty/catch/single_include -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -O2 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libmount -I/usr/include/libxml2 -I/usr/include/sysprof-6 -I/usr/include/libpng16 -DWITH_GZFILEOP -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/cloudproviders -I/usr/include/at-spi-2.0 -I/usr/include/gio-unix-2.0 -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -DPIC ../../tests/allheaders.cpp
In file included from ../../include/wx/evtloop.h:13,
from ../../tests/testprec.h:5,
from ../../tests/allheaders.cpp:369:
../../include/wx/event.h: In copy constructor ‘wxSetCursorEvent::wxSetCursorEvent(const wxSetCursorEvent&)’:
../../include/wx/event.h:1943:11: error: implicitly-declared ‘wxCursor::wxCursor(const wxCursor&)’ is deprecated [-Werror=deprecated-copy-dtor]
1943 | m_cursor(event.m_cursor)
| ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../../include/wx/cursor.h:51,
from ../../include/wx/event.h:21:
../../include/wx/gtk/cursor.h:37:13: note: because ‘wxCursor’ has user-provided ‘virtual wxCursor::~wxCursor()’
37 | virtual ~wxCursor();
| ^
../../include/wx/event.h: In member function ‘void wxSetCursorEvent::SetCursor(const wxCursor&)’:
../../include/wx/event.h:1949:57: error: implicitly-declared ‘wxCursor& wxCursor::operator=(const wxCursor&)’ is deprecated [-Werror=deprecated-copy-dtor]
1949 | void SetCursor(const wxCursor& cursor) { m_cursor = cursor; }
| ^~~~~~
../../include/wx/gtk/cursor.h:37:13: note: because ‘wxCursor’ has user-provided ‘virtual wxCursor::~wxCursor()’
37 | virtual ~wxCursor();
| ^
Fixes #24248.
Closes #24255.
This commit is contained in:
parent
50e35c71eb
commit
fc35ad92bb
63 changed files with 0 additions and 234 deletions
|
|
@ -340,9 +340,6 @@ public:
|
||||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// creator function
|
|
||||||
virtual ~wxFontBase();
|
|
||||||
|
|
||||||
|
|
||||||
// from the font components
|
// from the font components
|
||||||
static wxFont *New(
|
static wxFont *New(
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
|
||||||
public:
|
public:
|
||||||
wxAcceleratorTable();
|
wxAcceleratorTable();
|
||||||
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
|
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
|
||||||
virtual ~wxAcceleratorTable();
|
|
||||||
|
|
||||||
bool Ok() const { return IsOk(); }
|
bool Ok() const { return IsOk(); }
|
||||||
bool IsOk() const;
|
bool IsOk() const;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
|
||||||
public:
|
public:
|
||||||
wxPalette();
|
wxPalette();
|
||||||
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
|
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
|
||||||
virtual ~wxPalette();
|
|
||||||
|
|
||||||
bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;
|
int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;
|
||||||
|
|
|
||||||
|
|
@ -128,7 +128,6 @@ class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject
|
||||||
public:
|
public:
|
||||||
wxGraphicsObject();
|
wxGraphicsObject();
|
||||||
wxGraphicsObject( wxGraphicsRenderer* renderer );
|
wxGraphicsObject( wxGraphicsRenderer* renderer );
|
||||||
virtual ~wxGraphicsObject();
|
|
||||||
|
|
||||||
bool IsNull() const;
|
bool IsNull() const;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,6 @@ public:
|
||||||
#endif // wxUSE_IMAGE
|
#endif // wxUSE_IMAGE
|
||||||
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
|
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
|
||||||
explicit wxBitmap(const wxCursor& cursor);
|
explicit wxBitmap(const wxCursor& cursor);
|
||||||
virtual ~wxBitmap();
|
|
||||||
|
|
||||||
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override;
|
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override;
|
||||||
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override
|
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ public:
|
||||||
|
|
||||||
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
|
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
|
||||||
wxBrush( const wxBitmap &stippleBitmap );
|
wxBrush( const wxBitmap &stippleBitmap );
|
||||||
virtual ~wxBrush();
|
|
||||||
|
|
||||||
bool operator==(const wxBrush& brush) const;
|
bool operator==(const wxBrush& brush) const;
|
||||||
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,6 @@ public:
|
||||||
wxColour(const GdkRGBA& gdkRGBA);
|
wxColour(const GdkRGBA& gdkRGBA);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual ~wxColour();
|
|
||||||
|
|
||||||
bool operator==(const wxColour& col) const;
|
bool operator==(const wxColour& col) const;
|
||||||
bool operator!=(const wxColour& col) const { return !(*this == col); }
|
bool operator!=(const wxColour& col) const { return !(*this == col); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,6 @@ public:
|
||||||
|
|
||||||
virtual wxPoint GetHotSpot() const override;
|
virtual wxPoint GetHotSpot() const override;
|
||||||
|
|
||||||
virtual ~wxCursor();
|
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
|
|
||||||
GdkCursor *GetCursor() const;
|
GdkCursor *GetCursor() const;
|
||||||
|
|
|
||||||
|
|
@ -61,8 +61,6 @@ public:
|
||||||
// wxGTK-specific
|
// wxGTK-specific
|
||||||
bool Create(const wxString& fontname);
|
bool Create(const wxString& fontname);
|
||||||
|
|
||||||
virtual ~wxFont();
|
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual double GetFractionalPointSize() const override;
|
virtual double GetFractionalPointSize() const override;
|
||||||
virtual wxFontStyle GetStyle() const override;
|
virtual wxFontStyle GetStyle() const override;
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,6 @@ public:
|
||||||
|
|
||||||
wxPen( const wxPenInfo& info );
|
wxPen( const wxPenInfo& info );
|
||||||
|
|
||||||
virtual ~wxPen();
|
|
||||||
|
|
||||||
bool operator==(const wxPen& pen) const;
|
bool operator==(const wxPen& pen) const;
|
||||||
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,8 +113,6 @@ public:
|
||||||
}
|
}
|
||||||
#endif // WXWIN_COMPATIBILITY_3_0
|
#endif // WXWIN_COMPATIBILITY_3_0
|
||||||
|
|
||||||
virtual ~wxBitmap();
|
|
||||||
|
|
||||||
#if wxUSE_IMAGE
|
#if wxUSE_IMAGE
|
||||||
wxImage ConvertToImage() const;
|
wxImage ConvertToImage() const;
|
||||||
wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
|
wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ public:
|
||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
||||||
wxBrush(const wxBitmap& stipple);
|
wxBrush(const wxBitmap& stipple);
|
||||||
virtual ~wxBrush();
|
|
||||||
|
|
||||||
virtual void SetColour(const wxColour& col) override;
|
virtual void SetColour(const wxColour& col) override;
|
||||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;
|
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,6 @@ public:
|
||||||
|
|
||||||
virtual wxPoint GetHotSpot() const override;
|
virtual wxPoint GetHotSpot() const override;
|
||||||
|
|
||||||
virtual ~wxCursor();
|
|
||||||
|
|
||||||
// implementation only
|
// implementation only
|
||||||
void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); }
|
void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); }
|
||||||
WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
|
WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
|
||||||
|
|
|
||||||
|
|
@ -91,8 +91,6 @@ public:
|
||||||
|
|
||||||
bool Create(const wxNativeFontInfo& info, WXHFONT hFont = nullptr);
|
bool Create(const wxNativeFontInfo& info, WXHFONT hFont = nullptr);
|
||||||
|
|
||||||
virtual ~wxFont();
|
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual double GetFractionalPointSize() const override;
|
virtual double GetFractionalPointSize() const override;
|
||||||
virtual wxSize GetPixelSize() const override;
|
virtual wxSize GetPixelSize() const override;
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,6 @@ public:
|
||||||
|
|
||||||
wxPen(const wxPenInfo& info);
|
wxPen(const wxPenInfo& info);
|
||||||
|
|
||||||
virtual ~wxPen() = default;
|
|
||||||
|
|
||||||
bool operator==(const wxPen& pen) const;
|
bool operator==(const wxPen& pen) const;
|
||||||
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,6 @@ public:
|
||||||
wxAcceleratorTable();
|
wxAcceleratorTable();
|
||||||
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
|
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
|
||||||
|
|
||||||
virtual ~wxAcceleratorTable();
|
|
||||||
|
|
||||||
bool Ok() const { return IsOk(); }
|
bool Ok() const { return IsOk(); }
|
||||||
bool IsOk() const;
|
bool IsOk() const;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -123,8 +123,6 @@ public:
|
||||||
wxBitmap(const wxCursor &cursor);
|
wxBitmap(const wxCursor &cursor);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
virtual ~wxBitmap() = default;
|
|
||||||
|
|
||||||
wxImage ConvertToImage() const override;
|
wxImage ConvertToImage() const override;
|
||||||
|
|
||||||
// get the given part of bitmap
|
// get the given part of bitmap
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ public:
|
||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
||||||
wxBrush(const wxBitmap& stipple);
|
wxBrush(const wxBitmap& stipple);
|
||||||
virtual ~wxBrush();
|
|
||||||
|
|
||||||
virtual void SetColour(const wxColour& col) override;
|
virtual void SetColour(const wxColour& col) override;
|
||||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;
|
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ public:
|
||||||
int hotSpotX = 0, int hotSpotY = 0);
|
int hotSpotX = 0, int hotSpotY = 0);
|
||||||
|
|
||||||
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
||||||
virtual ~wxCursor();
|
|
||||||
|
|
||||||
void MacInstall() const ;
|
void MacInstall() const ;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,6 @@ public:
|
||||||
|
|
||||||
bool Create(const wxNativeFontInfo& info);
|
bool Create(const wxNativeFontInfo& info);
|
||||||
|
|
||||||
virtual ~wxFont();
|
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual double GetFractionalPointSize() const override;
|
virtual double GetFractionalPointSize() const override;
|
||||||
virtual wxSize GetPixelSize() const override;
|
virtual wxSize GetPixelSize() const override;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ public:
|
||||||
wxPalette();
|
wxPalette();
|
||||||
|
|
||||||
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
virtual ~wxPalette();
|
|
||||||
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
|
|
||||||
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,6 @@ public:
|
||||||
|
|
||||||
wxPen(const wxPenInfo& info);
|
wxPen(const wxPenInfo& info);
|
||||||
|
|
||||||
virtual ~wxPen();
|
|
||||||
|
|
||||||
bool operator==(const wxPen& pen) const;
|
bool operator==(const wxPen& pen) const;
|
||||||
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,6 @@ public:
|
||||||
wxBitmap( const char bits[], int width, int height, int depth = 1 );
|
wxBitmap( const char bits[], int width, int height, int depth = 1 );
|
||||||
wxBitmap( const char* const* bits );
|
wxBitmap( const char* const* bits );
|
||||||
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
|
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
|
||||||
virtual ~wxBitmap();
|
|
||||||
|
|
||||||
static void InitStandardHandlers();
|
static void InitStandardHandlers();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ public:
|
||||||
|
|
||||||
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
|
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
|
||||||
wxBrush( const wxBitmap &stippleBitmap );
|
wxBrush( const wxBitmap &stippleBitmap );
|
||||||
virtual ~wxBrush();
|
|
||||||
|
|
||||||
bool operator==(const wxBrush& brush) const;
|
bool operator==(const wxBrush& brush) const;
|
||||||
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@ public:
|
||||||
// ------------
|
// ------------
|
||||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||||
|
|
||||||
virtual ~wxColour();
|
|
||||||
|
|
||||||
bool operator==(const wxColour& col) const;
|
bool operator==(const wxColour& col) const;
|
||||||
bool operator!=(const wxColour& col) const { return !(*this == col); }
|
bool operator!=(const wxColour& col) const { return !(*this == col); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ public:
|
||||||
wxCursor(const wxString& name,
|
wxCursor(const wxString& name,
|
||||||
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
||||||
int hotSpotX = 0, int hotSpotY = 0);
|
int hotSpotX = 0, int hotSpotY = 0);
|
||||||
virtual ~wxCursor();
|
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,8 +77,6 @@ public:
|
||||||
// DELETEME: no longer seems to be implemented.
|
// DELETEME: no longer seems to be implemented.
|
||||||
// bool Create(const wxNativeFontInfo& fontinfo);
|
// bool Create(const wxNativeFontInfo& fontinfo);
|
||||||
|
|
||||||
virtual ~wxFont();
|
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual double GetFractionalPointSize() const;
|
virtual double GetFractionalPointSize() const;
|
||||||
virtual wxFontStyle GetStyle() const;
|
virtual wxFontStyle GetStyle() const;
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,6 @@ public:
|
||||||
wxPalette();
|
wxPalette();
|
||||||
|
|
||||||
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
virtual ~wxPalette();
|
|
||||||
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
||||||
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
|
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@ public:
|
||||||
|
|
||||||
wxPen( const wxPenInfo& info );
|
wxPen( const wxPenInfo& info );
|
||||||
|
|
||||||
virtual ~wxPen();
|
|
||||||
|
|
||||||
bool operator == ( const wxPen& pen ) const;
|
bool operator == ( const wxPen& pen ) const;
|
||||||
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -223,12 +223,6 @@ public:
|
||||||
*/
|
*/
|
||||||
wxAcceleratorTable(const wxString& resource);
|
wxAcceleratorTable(const wxString& resource);
|
||||||
|
|
||||||
/**
|
|
||||||
Destroys the wxAcceleratorTable object.
|
|
||||||
See @ref overview_refcount_destruct for more info.
|
|
||||||
*/
|
|
||||||
virtual ~wxAcceleratorTable();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns @true if the accelerator table is valid.
|
Returns @true if the accelerator table is valid.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -396,18 +396,6 @@ public:
|
||||||
*/
|
*/
|
||||||
explicit wxBitmap(const wxCursor& cursor);
|
explicit wxBitmap(const wxCursor& cursor);
|
||||||
|
|
||||||
/**
|
|
||||||
Destructor.
|
|
||||||
See @ref overview_refcount_destruct for more info.
|
|
||||||
|
|
||||||
If the application omits to delete the bitmap explicitly, the bitmap will be
|
|
||||||
destroyed automatically by wxWidgets when the application exits.
|
|
||||||
|
|
||||||
@warning
|
|
||||||
Do not delete a bitmap that is selected into a memory device context.
|
|
||||||
*/
|
|
||||||
virtual ~wxBitmap();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Adds a handler to the end of the static list of format handlers.
|
Adds a handler to the end of the static list of format handlers.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -131,19 +131,6 @@ public:
|
||||||
*/
|
*/
|
||||||
wxBrush(const wxBrush& brush);
|
wxBrush(const wxBrush& brush);
|
||||||
|
|
||||||
/**
|
|
||||||
Destructor.
|
|
||||||
|
|
||||||
See @ref overview_refcount_destruct for more info.
|
|
||||||
|
|
||||||
@remarks Although all remaining brushes are deleted when the application
|
|
||||||
exits, the application should try to clean up all brushes itself.
|
|
||||||
This is because wxWidgets cannot know if a pointer to the brush
|
|
||||||
object is stored in an application data structure, and there is
|
|
||||||
a risk of double deletion.
|
|
||||||
*/
|
|
||||||
virtual ~wxBrush();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns a reference to the brush colour.
|
Returns a reference to the brush colour.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -205,17 +205,6 @@ public:
|
||||||
*/
|
*/
|
||||||
wxCursor(const wxCursor& cursor);
|
wxCursor(const wxCursor& cursor);
|
||||||
|
|
||||||
/**
|
|
||||||
Destroys the cursor. See
|
|
||||||
@ref overview_refcount_destruct "reference-counted object destruction"
|
|
||||||
for more info.
|
|
||||||
|
|
||||||
A cursor can be reused for more than one window, and does not get
|
|
||||||
destroyed when the window is destroyed. wxWidgets destroys all cursors
|
|
||||||
on application exit, although it is best to clean them up explicitly.
|
|
||||||
*/
|
|
||||||
virtual ~wxCursor();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns @true if cursor data is present.
|
Returns @true if cursor data is present.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -637,20 +637,6 @@ public:
|
||||||
*/
|
*/
|
||||||
wxFont(const wxNativeFontInfo& nativeInfo);
|
wxFont(const wxNativeFontInfo& nativeInfo);
|
||||||
|
|
||||||
/**
|
|
||||||
Destructor.
|
|
||||||
|
|
||||||
See @ref overview_refcount_destruct "reference-counted object destruction"
|
|
||||||
for more info.
|
|
||||||
|
|
||||||
@remarks Although all remaining fonts are deleted when the application
|
|
||||||
exits, the application should try to clean up all fonts
|
|
||||||
itself. This is because wxWidgets cannot know if a
|
|
||||||
pointer to the font object is stored in an application
|
|
||||||
data structure, and there is a risk of double deletion.
|
|
||||||
*/
|
|
||||||
virtual ~wxFont();
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@name Getters
|
@name Getters
|
||||||
|
|
|
||||||
|
|
@ -70,13 +70,6 @@ public:
|
||||||
const unsigned char* green,
|
const unsigned char* green,
|
||||||
const unsigned char* blue);
|
const unsigned char* blue);
|
||||||
|
|
||||||
/**
|
|
||||||
Destructor.
|
|
||||||
|
|
||||||
@see @ref overview_refcount_destruct "reference-counted object destruction"
|
|
||||||
*/
|
|
||||||
virtual ~wxPalette();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Creates a palette from arrays of size @a n, one for each red, blue or
|
Creates a palette from arrays of size @a n, one for each red, blue or
|
||||||
green component.
|
green component.
|
||||||
|
|
|
||||||
|
|
@ -318,18 +318,6 @@ public:
|
||||||
*/
|
*/
|
||||||
wxPen(const wxPen& pen);
|
wxPen(const wxPen& pen);
|
||||||
|
|
||||||
/**
|
|
||||||
Destructor.
|
|
||||||
@see @ref overview_refcount_destruct "reference-counted object destruction"
|
|
||||||
|
|
||||||
@remarks Although all remaining pens are deleted when the application
|
|
||||||
exits, the application should try to clean up all pens
|
|
||||||
itself. This is because wxWidgets cannot know if a
|
|
||||||
pointer to the pen object is stored in an application
|
|
||||||
data structure, and there is a risk of double deletion.
|
|
||||||
*/
|
|
||||||
virtual ~wxPen();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the pen cap style, which may be one of @c wxCAP_ROUND,
|
Returns the pen cap style, which may be one of @c wxCAP_ROUND,
|
||||||
@c wxCAP_PROJECTING and @c wxCAP_BUTT.
|
@c wxCAP_PROJECTING and @c wxCAP_BUTT.
|
||||||
|
|
|
||||||
|
|
@ -140,11 +140,6 @@ void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
|
||||||
ms_encodingDefault = encoding;
|
ms_encodingDefault = encoding;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFontBase::~wxFontBase()
|
|
||||||
{
|
|
||||||
// this destructor is required for Darwin
|
|
||||||
}
|
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
wxFont *wxFontBase::New(int size,
|
wxFont *wxFontBase::New(int size,
|
||||||
wxFontFamily family,
|
wxFontFamily family,
|
||||||
|
|
|
||||||
|
|
@ -71,10 +71,6 @@ wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer )
|
||||||
SetRefData( new wxGraphicsObjectRefData(renderer));
|
SetRefData( new wxGraphicsObjectRefData(renderer));
|
||||||
}
|
}
|
||||||
|
|
||||||
wxGraphicsObject::~wxGraphicsObject()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxGraphicsObject::IsNull() const
|
bool wxGraphicsObject::IsNull() const
|
||||||
{
|
{
|
||||||
return m_refData == nullptr;
|
return m_refData == nullptr;
|
||||||
|
|
|
||||||
|
|
@ -85,10 +85,6 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wxAcceleratorTable::~wxAcceleratorTable()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxAcceleratorTable::IsOk() const
|
bool wxAcceleratorTable::IsOk() const
|
||||||
{
|
{
|
||||||
return m_refData != nullptr;
|
return m_refData != nullptr;
|
||||||
|
|
|
||||||
|
|
@ -58,10 +58,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
|
||||||
Create(n, red, green, blue);
|
Create(n, red, green, blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPalette::~wxPalette()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int wxPalette::GetColoursCount() const
|
int wxPalette::GetColoursCount() const
|
||||||
{
|
{
|
||||||
if (m_refData)
|
if (m_refData)
|
||||||
|
|
|
||||||
|
|
@ -531,10 +531,6 @@ wxBitmap::wxBitmap(const wxCursor& cursor)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::~wxBitmap()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxBitmap::Create( int width, int height, int depth )
|
bool wxBitmap::Create( int width, int height, int depth )
|
||||||
{
|
{
|
||||||
UnRef();
|
UnRef();
|
||||||
|
|
|
||||||
|
|
@ -75,11 +75,6 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
|
||||||
M_BRUSHDATA->m_stipple = stippleBitmap;
|
M_BRUSHDATA->m_stipple = stippleBitmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBrush::~wxBrush()
|
|
||||||
{
|
|
||||||
// m_refData unrefed in ~wxObject
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxBrushRefData;
|
return new wxBrushRefData;
|
||||||
|
|
|
||||||
|
|
@ -139,10 +139,6 @@ wxColour::wxColour(const GdkColor& gdkColor)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxColour::~wxColour()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxColour::operator == ( const wxColour& col ) const
|
bool wxColour::operator == ( const wxColour& col ) const
|
||||||
{
|
{
|
||||||
if (m_refData == col.m_refData)
|
if (m_refData == col.m_refData)
|
||||||
|
|
|
||||||
|
|
@ -173,10 +173,6 @@ wxCursor::wxCursor(const char bits[], int width, int height,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxCursor::~wxCursor()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
wxPoint wxCursor::GetHotSpot() const
|
wxPoint wxCursor::GetHotSpot() const
|
||||||
{
|
{
|
||||||
#if GTK_CHECK_VERSION(2,8,0)
|
#if GTK_CHECK_VERSION(2,8,0)
|
||||||
|
|
|
||||||
|
|
@ -275,10 +275,6 @@ bool wxFont::Create(const wxString& fontname)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFont::~wxFont()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// accessors
|
// accessors
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -115,11 +115,6 @@ wxPen::wxPen(const wxPenInfo& info)
|
||||||
m_refData = new wxPenRefData(info);
|
m_refData = new wxPenRefData(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPen::~wxPen()
|
|
||||||
{
|
|
||||||
// m_refData unrefed in ~wxObject
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxPen::CreateGDIRefData() const
|
wxGDIRefData *wxPen::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxPenRefData;
|
return new wxPenRefData;
|
||||||
|
|
|
||||||
|
|
@ -665,10 +665,6 @@ bool wxBitmap::ConvertToDIB()
|
||||||
|
|
||||||
#endif // wxUSE_WXDIB
|
#endif // wxUSE_WXDIB
|
||||||
|
|
||||||
wxBitmap::~wxBitmap()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
|
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
|
||||||
{
|
{
|
||||||
wxBitmapRefData *refData = new wxBitmapRefData;
|
wxBitmapRefData *refData = new wxBitmapRefData;
|
||||||
|
|
|
||||||
|
|
@ -229,10 +229,6 @@ wxBrush::wxBrush(const wxBitmap& stipple)
|
||||||
m_refData = new wxBrushRefData(stipple);
|
m_refData = new wxBrushRefData(stipple);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBrush::~wxBrush()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxBrush house keeping stuff
|
// wxBrush house keeping stuff
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -401,10 +401,6 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wxCursor::~wxCursor()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// other wxCursor functions
|
// other wxCursor functions
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -833,10 +833,6 @@ bool wxFont::DoCreate(const wxFontInfo& info)
|
||||||
return RealizeResource();
|
return RealizeResource();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFont::~wxFont()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// real implementation
|
// real implementation
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -39,10 +39,6 @@ wxAcceleratorTable::wxAcceleratorTable()
|
||||||
m_refData = nullptr;
|
m_refData = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxAcceleratorTable::~wxAcceleratorTable()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create from an array
|
// Create from an array
|
||||||
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -89,10 +89,6 @@ wxBrush::wxBrush()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBrush::~wxBrush()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
|
wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
|
||||||
{
|
{
|
||||||
m_refData = new wxBrushRefData( col, style );
|
m_refData = new wxBrushRefData( col, style );
|
||||||
|
|
|
||||||
|
|
@ -315,10 +315,6 @@ void wxCursor::MacInstall() const
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxCursor::~wxCursor()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Global cursor setting
|
// Global cursor setting
|
||||||
wxCursor gGlobalCursor;
|
wxCursor gGlobalCursor;
|
||||||
void wxSetCursor(const wxCursor& cursor)
|
void wxSetCursor(const wxCursor& cursor)
|
||||||
|
|
|
||||||
|
|
@ -623,10 +623,6 @@ bool wxFont::Create(int pointSize,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFont::~wxFont()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
|
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
|
||||||
{
|
{
|
||||||
UnRef();
|
UnRef();
|
||||||
|
|
|
||||||
|
|
@ -70,10 +70,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
|
||||||
Create(n, red, green, blue);
|
Create(n, red, green, blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPalette::~wxPalette()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
|
bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
|
||||||
{
|
{
|
||||||
UnRef();
|
UnRef();
|
||||||
|
|
|
||||||
|
|
@ -101,10 +101,6 @@ wxPen::wxPen()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPen::~wxPen()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Should implement Create
|
// Should implement Create
|
||||||
wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
|
wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -952,10 +952,6 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int depth )
|
||||||
(void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
|
(void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap::~wxBitmap()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int wxBitmap::GetHeight() const
|
int wxBitmap::GetHeight() const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
|
wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
|
||||||
|
|
|
||||||
|
|
@ -83,11 +83,6 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
|
||||||
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBrush::~wxBrush()
|
|
||||||
{
|
|
||||||
// m_refData unrefed in ~wxObject
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxBrushRefData;
|
return new wxBrushRefData;
|
||||||
|
|
|
||||||
|
|
@ -140,10 +140,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
|
||||||
|
|
||||||
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
|
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
|
||||||
|
|
||||||
wxColour::~wxColour()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wxColour::operator == ( const wxColour& col ) const
|
bool wxColour::operator == ( const wxColour& col ) const
|
||||||
{
|
{
|
||||||
if (m_refData == col.m_refData) return true;
|
if (m_refData == col.m_refData) return true;
|
||||||
|
|
|
||||||
|
|
@ -146,10 +146,6 @@ wxCursor::wxCursor(const char* const* WXUNUSED(xpmData))
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxCursor::~wxCursor()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxCursor::CreateGDIRefData() const
|
wxGDIRefData *wxCursor::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxCursorRefData;
|
return new wxCursorRefData;
|
||||||
|
|
|
||||||
|
|
@ -439,10 +439,6 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding WXUNUSED(enc))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFont::~wxFont()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxFont::CreateGDIRefData() const
|
wxGDIRefData *wxFont::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxFontRefData;
|
return new wxFontRefData;
|
||||||
|
|
|
||||||
|
|
@ -126,10 +126,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
|
||||||
Create(n, red, green, blue);
|
Create(n, red, green, blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPalette::~wxPalette()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int wxPalette::GetColoursCount() const
|
int wxPalette::GetColoursCount() const
|
||||||
{
|
{
|
||||||
if (m_refData)
|
if (m_refData)
|
||||||
|
|
|
||||||
|
|
@ -107,11 +107,6 @@ wxPen::wxPen(const wxPenInfo& info)
|
||||||
m_refData = new wxPenRefData(info);
|
m_refData = new wxPenRefData(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPen::~wxPen()
|
|
||||||
{
|
|
||||||
// m_refData unrefed in ~wxObject
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGDIRefData *wxPen::CreateGDIRefData() const
|
wxGDIRefData *wxPen::CreateGDIRefData() const
|
||||||
{
|
{
|
||||||
return new wxPenRefData;
|
return new wxPenRefData;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue