mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,7 +70,7 @@ class WXDLLIMPEXP_ANIMATE wxAnimationPlayer : public wxObject
|
||||
|
||||
public:
|
||||
wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = false);
|
||||
~wxAnimationPlayer();
|
||||
virtual ~wxAnimationPlayer();
|
||||
|
||||
//// Accessors
|
||||
|
||||
@@ -226,8 +226,8 @@ class WXDLLIMPEXP_ANIMATE wxAnimationBase : public wxObject
|
||||
DECLARE_ABSTRACT_CLASS(wxAnimationBase)
|
||||
|
||||
public:
|
||||
wxAnimationBase() {};
|
||||
~wxAnimationBase() {};
|
||||
wxAnimationBase() {}
|
||||
virtual ~wxAnimationBase() {}
|
||||
|
||||
//// Accessors. Should be overridden by each derived class.
|
||||
|
||||
@@ -262,7 +262,7 @@ class WXDLLIMPEXP_ANIMATE wxGIFAnimation : public wxAnimationBase
|
||||
|
||||
public:
|
||||
wxGIFAnimation();
|
||||
~wxGIFAnimation();
|
||||
virtual ~wxGIFAnimation();
|
||||
|
||||
//// Accessors
|
||||
|
||||
@@ -308,7 +308,7 @@ public:
|
||||
{
|
||||
Create(parent, id, filename, pos, size, style, name);
|
||||
}
|
||||
~wxAnimationCtrlBase();
|
||||
virtual ~wxAnimationCtrlBase();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& filename = wxEmptyString,
|
||||
|
@@ -66,7 +66,7 @@ public:
|
||||
wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL);
|
||||
|
||||
// Destructor
|
||||
~wxLoadPageEvent() {}
|
||||
virtual ~wxLoadPageEvent() {}
|
||||
|
||||
// Clone Virtual
|
||||
virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); }
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
wxPageLoadedEvent();
|
||||
|
||||
// Destructor
|
||||
~wxPageLoadedEvent() {}
|
||||
virtual ~wxPageLoadedEvent() {}
|
||||
|
||||
// Clone Virtual
|
||||
virtual wxEvent *Clone() const {
|
||||
|
@@ -45,7 +45,7 @@ private:
|
||||
|
||||
public:
|
||||
wxEchoPrep() : wxHtmlProcessor() {}
|
||||
~wxEchoPrep() {}
|
||||
virtual ~wxEchoPrep() {}
|
||||
|
||||
// Process input text and return processed result
|
||||
wxString Process(const wxString& text) const;
|
||||
|
@@ -45,7 +45,7 @@ private:
|
||||
|
||||
public:
|
||||
wxIfElsePrep() : wxHtmlProcessor() {}
|
||||
~wxIfElsePrep() {}
|
||||
virtual ~wxIfElsePrep() {}
|
||||
|
||||
// Process input text and return processed result
|
||||
wxString Process(const wxString& text) const;
|
||||
|
@@ -49,7 +49,7 @@ private:
|
||||
wxFileSystem *m_FS;
|
||||
public:
|
||||
wxIncludePrep() : wxHtmlProcessor() {}
|
||||
~wxIncludePrep() {}
|
||||
virtual ~wxIncludePrep() {}
|
||||
|
||||
// Process input text and return processed result
|
||||
wxString Process(const wxString& text) const;
|
||||
|
@@ -140,7 +140,7 @@ public:
|
||||
const wxString& name = "htmlAppletWindow");
|
||||
|
||||
// Destructor
|
||||
~wxHtmlAppletWindow();
|
||||
virtual ~wxHtmlAppletWindow();
|
||||
|
||||
// Create an instance of an applet based on it's class name
|
||||
wxApplet *CreateApplet(
|
||||
|
@@ -88,7 +88,7 @@ public:
|
||||
|
||||
wxSize GetGridSizeInPixels() const;
|
||||
|
||||
~BombsCanvas();
|
||||
virtual ~BombsCanvas();
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -14,7 +14,7 @@ class MainFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size);
|
||||
~MainFrame(void);
|
||||
virtual ~MainFrame(void);
|
||||
|
||||
public:
|
||||
// menu callbacks
|
||||
|
@@ -16,8 +16,8 @@
|
||||
class FortyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
FortyApp(){};
|
||||
~FortyApp();
|
||||
FortyApp(){}
|
||||
virtual ~FortyApp();
|
||||
bool OnInit();
|
||||
|
||||
static const wxColour& BackgroundColour();
|
||||
|
@@ -24,7 +24,7 @@ const int MaxMoves = 800;
|
||||
class Pack : public Pile {
|
||||
public:
|
||||
Pack(int x, int y);
|
||||
~Pack();
|
||||
virtual ~Pack();
|
||||
void Redraw(wxDC& dc);
|
||||
void ResetPile() { m_topCard = NumCards - 1; }
|
||||
void Shuffle();
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
class Base : public Pile {
|
||||
public:
|
||||
Base(int x, int y);
|
||||
~Base(){};
|
||||
virtual ~Base(){}
|
||||
bool AcceptCard(Card* card);
|
||||
};
|
||||
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
class Foundation : public Pile {
|
||||
public:
|
||||
Foundation(int x, int y);
|
||||
~Foundation(){};
|
||||
virtual ~Foundation(){}
|
||||
bool AcceptCard(Card* card);
|
||||
};
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
class Discard : public Pile {
|
||||
public:
|
||||
Discard(int x, int y);
|
||||
~Discard(){};
|
||||
virtual ~Discard(){}
|
||||
void Redraw(wxDC& dc);
|
||||
void GetTopCardPos(int& x, int& y);
|
||||
Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset);
|
||||
|
@@ -37,7 +37,7 @@ class LifeSamplesDialog : public wxDialog
|
||||
public:
|
||||
// ctor and dtor
|
||||
LifeSamplesDialog(wxWindow *parent);
|
||||
~LifeSamplesDialog();
|
||||
virtual ~LifeSamplesDialog();
|
||||
|
||||
// members
|
||||
const LifePattern& GetPattern();
|
||||
|
@@ -41,7 +41,7 @@ class LifeCanvas : public wxWindow
|
||||
public:
|
||||
// ctor and dtor
|
||||
LifeCanvas(wxWindow* parent, Life* life, bool interactive = true);
|
||||
~LifeCanvas();
|
||||
virtual ~LifeCanvas();
|
||||
|
||||
// view management
|
||||
int GetCellSize() const { return m_cellsize; };
|
||||
@@ -122,7 +122,7 @@ class LifeFrame : public wxFrame
|
||||
public:
|
||||
// ctor and dtor
|
||||
LifeFrame();
|
||||
~LifeFrame();
|
||||
virtual ~LifeFrame();
|
||||
|
||||
// member functions
|
||||
void UpdateInfoText();
|
||||
|
@@ -29,7 +29,7 @@ class MyCanvas: public wxWindow
|
||||
{
|
||||
public:
|
||||
MyCanvas(wxFrame *frame);
|
||||
~MyCanvas();
|
||||
virtual ~MyCanvas();
|
||||
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
@@ -47,7 +47,7 @@ class MainWindow: public wxFrame
|
||||
public:
|
||||
MyCanvas *canvas;
|
||||
MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
|
||||
~MainWindow();
|
||||
virtual ~MainWindow();
|
||||
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnChar(wxKeyEvent& event);
|
||||
|
@@ -37,7 +37,7 @@ public:
|
||||
const wxPaneInfo& pane,
|
||||
wxWindowID id = wxID_ANY
|
||||
);
|
||||
~wxFloatingPane();
|
||||
virtual ~wxFloatingPane();
|
||||
void SetPaneWindow(const wxPaneInfo& pane);
|
||||
private:
|
||||
void OnSize(wxSizeEvent& event);
|
||||
|
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxCommand : public wxObject
|
||||
{
|
||||
public:
|
||||
wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
|
||||
~wxCommand(){}
|
||||
virtual ~wxCommand(){}
|
||||
|
||||
// Override this to perform a command
|
||||
virtual bool Do() = 0;
|
||||
|
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxColourData: public wxObject
|
||||
public:
|
||||
wxColourData();
|
||||
wxColourData(const wxColourData& data);
|
||||
~wxColourData();
|
||||
virtual ~wxColourData();
|
||||
|
||||
void SetChooseFull(bool flag) { m_chooseFull = flag; }
|
||||
bool GetChooseFull() const { return m_chooseFull; }
|
||||
@@ -172,7 +172,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
|
||||
public:
|
||||
wxPrintData();
|
||||
wxPrintData(const wxPrintData& printData);
|
||||
~wxPrintData();
|
||||
virtual ~wxPrintData();
|
||||
|
||||
int GetNoCopies() const { return m_printNoCopies; }
|
||||
bool GetCollate() const { return m_printCollate; }
|
||||
@@ -282,7 +282,7 @@ public:
|
||||
wxPrintDialogData();
|
||||
wxPrintDialogData(const wxPrintDialogData& dialogData);
|
||||
wxPrintDialogData(const wxPrintData& printData);
|
||||
~wxPrintDialogData();
|
||||
virtual ~wxPrintDialogData();
|
||||
|
||||
int GetFromPage() const { return m_printFromPage; };
|
||||
int GetToPage() const { return m_printToPage; };
|
||||
@@ -363,7 +363,7 @@ public:
|
||||
wxPageSetupDialogData();
|
||||
wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
|
||||
wxPageSetupDialogData(const wxPrintData& printData);
|
||||
~wxPageSetupDialogData();
|
||||
virtual ~wxPageSetupDialogData();
|
||||
|
||||
wxSize GetPaperSize() const { return m_paperSize; };
|
||||
wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
// Construct a mask from a mono bitmap (copies the bitmap).
|
||||
wxMask(const wxBitmap& bitmap);
|
||||
|
||||
~wxMask();
|
||||
virtual ~wxMask();
|
||||
|
||||
bool Create(const wxBitmap& bitmap, const wxColour& colour);
|
||||
bool Create(const wxBitmap& bitmap, int paletteIndex);
|
||||
@@ -86,7 +86,7 @@ public:
|
||||
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
|
||||
|
||||
// destructor
|
||||
~wxBitmap();
|
||||
virtual ~wxBitmap();
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
wxBrush();
|
||||
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||
wxBrush(const wxBitmap& stipple);
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
@@ -22,7 +22,7 @@ class wxClipboard : public wxClipboardBase
|
||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
|
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
|
||||
friend class WXDLLEXPORT wxCursor;
|
||||
public:
|
||||
wxCursorRefData();
|
||||
~wxCursorRefData();
|
||||
virtual ~wxCursorRefData();
|
||||
|
||||
protected:
|
||||
int m_width, m_height;
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
int hotSpotX = 0, int hotSpotY = 0);
|
||||
|
||||
wxCursor(int cursor_type);
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
|
||||
virtual bool Ok() const { return m_refData ; }
|
||||
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxBitmapDataObject(const wxBitmap& bitmap);
|
||||
|
||||
// destr
|
||||
~wxBitmapDataObject();
|
||||
virtual ~wxBitmapDataObject();
|
||||
|
||||
// override base class virtual to update PNG data too
|
||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||
|
@@ -29,7 +29,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
//-------------------------------------------------------------------------
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC();
|
||||
virtual ~wxDC();
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// wxCocoa specifics
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
wxWindowDC(void);
|
||||
// Create a DC corresponding to a window
|
||||
wxWindowDC(wxWindow *win);
|
||||
~wxWindowDC(void);
|
||||
virtual ~wxWindowDC(void);
|
||||
|
||||
protected:
|
||||
wxWindow *m_window;
|
||||
@@ -45,7 +45,7 @@ public:
|
||||
wxClientDC(void);
|
||||
// Create a DC corresponding to a window
|
||||
wxClientDC(wxWindow *win);
|
||||
~wxClientDC(void);
|
||||
virtual ~wxClientDC(void);
|
||||
protected:
|
||||
// DC stack
|
||||
virtual bool CocoaLockFocus();
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
wxPaintDC(void);
|
||||
// Create a DC corresponding to a window
|
||||
wxPaintDC(wxWindow *win);
|
||||
~wxPaintDC(void);
|
||||
virtual ~wxPaintDC(void);
|
||||
protected:
|
||||
// DC stack
|
||||
virtual bool CocoaLockFocus();
|
||||
|
@@ -20,7 +20,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
|
||||
public:
|
||||
wxMemoryDC(void);
|
||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||
~wxMemoryDC(void);
|
||||
virtual ~wxMemoryDC(void);
|
||||
virtual void SelectObject(const wxBitmap& bitmap);
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
protected:
|
||||
|
@@ -20,7 +20,7 @@ class WXDLLEXPORT wxScreenDC: public wxDC
|
||||
public:
|
||||
wxScreenDC(void);
|
||||
wxScreenDC( wxDC *dc ); // Create compatible DC
|
||||
~wxScreenDC(void);
|
||||
virtual ~wxScreenDC(void);
|
||||
|
||||
// Compatibility with X's requirements for drawing on top of all windows
|
||||
static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }
|
||||
|
@@ -65,7 +65,7 @@ public:
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
|
||||
~wxDialog();
|
||||
virtual ~wxDialog();
|
||||
protected:
|
||||
void Init();
|
||||
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxString& name = wxDirDialogNameStr);
|
||||
~wxDirDialog();
|
||||
virtual ~wxDirDialog();
|
||||
|
||||
virtual int ShowModal();
|
||||
|
||||
|
@@ -33,7 +33,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& sz = wxDefaultSize,
|
||||
const wxString& name = wxFileDialogNameStr);
|
||||
~wxFileDialog();
|
||||
virtual ~wxFileDialog();
|
||||
|
||||
virtual void SetPath(const wxString& path);
|
||||
virtual void GetPaths(wxArrayString& paths) const;
|
||||
|
@@ -32,7 +32,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */ );
|
||||
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
|
||||
void SetCurrent();
|
||||
|
@@ -33,7 +33,7 @@ public:
|
||||
{
|
||||
LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
|
||||
}
|
||||
~wxIcon();
|
||||
virtual ~wxIcon();
|
||||
|
||||
bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
|
||||
int desiredWidth /* = -1 */ , int desiredHeight = -1);
|
||||
|
@@ -156,7 +156,7 @@ class wxMDIClientWindow: public wxWindow
|
||||
public:
|
||||
wxMDIClientWindow();
|
||||
wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
|
||||
~wxMDIClientWindow();
|
||||
virtual ~wxMDIClientWindow();
|
||||
virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 );
|
||||
};
|
||||
|
||||
|
@@ -28,7 +28,7 @@ public:
|
||||
wxPen();
|
||||
wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
|
||||
wxPen(const wxBitmap& stipple, int width);
|
||||
~wxPen();
|
||||
virtual ~wxPen();
|
||||
|
||||
// wxObjectRefData
|
||||
wxObjectRefData *CreateRefData() const;
|
||||
|
@@ -37,7 +37,7 @@ public:
|
||||
const wxColour& transColour, int tolerance = 0)
|
||||
: wxRegionGeneric()
|
||||
{ Union(bmp, transColour, tolerance); }
|
||||
~wxRegion() {}
|
||||
virtual ~wxRegion() {}
|
||||
wxRegion(const wxRegion& r)
|
||||
: wxRegionGeneric(r)
|
||||
{}
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
wxRegionIterator(const wxRegionIterator& iterator)
|
||||
: wxRegionIteratorGeneric(iterator)
|
||||
{}
|
||||
~wxRegionIterator() {}
|
||||
virtual ~wxRegionIterator() {}
|
||||
|
||||
wxRegionIterator& operator=(const wxRegionIterator& iter)
|
||||
{ return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
: m_cocoaNSSound(NULL)
|
||||
{ LoadWAV(data,size,true); }
|
||||
wxSound(const wxSound& sound); // why not?
|
||||
~wxSound();
|
||||
virtual ~wxSound();
|
||||
|
||||
public:
|
||||
bool Create(const wxString& fileName, bool isResource = false);
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual bool Start(int millisecs = -1, bool oneShot = false);
|
||||
virtual void Stop();
|
||||
|
@@ -257,7 +257,7 @@ class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
|
||||
public:
|
||||
wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
|
||||
int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
|
||||
~wxDataViewColumnBase();
|
||||
virtual ~wxDataViewColumnBase();
|
||||
|
||||
virtual void SetTitle( const wxString &title );
|
||||
virtual wxString GetTitle();
|
||||
@@ -297,7 +297,7 @@ class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
|
||||
{
|
||||
public:
|
||||
wxDataViewCtrlBase();
|
||||
~wxDataViewCtrlBase();
|
||||
virtual ~wxDataViewCtrlBase();
|
||||
|
||||
virtual bool AssociateModel( wxDataViewListModel *model );
|
||||
wxDataViewListModel* GetModel();
|
||||
|
@@ -115,7 +115,7 @@ class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase
|
||||
public:
|
||||
wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
|
||||
int count = wxUSE_QUERY, bool takeOwnership = true);
|
||||
~wxDbGridTableBase();
|
||||
virtual ~wxDbGridTableBase();
|
||||
|
||||
virtual int GetNumberRows()
|
||||
{
|
||||
|
@@ -132,7 +132,7 @@ public:
|
||||
ResetClipping();
|
||||
}
|
||||
|
||||
~wxDCBase() { }
|
||||
virtual ~wxDCBase() { }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
wxDEPRECATED( virtual void BeginDrawing() );
|
||||
|
@@ -65,7 +65,7 @@ public:
|
||||
wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
|
||||
const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
|
||||
~wxDocMDIChildFrame();
|
||||
virtual ~wxDocMDIChildFrame();
|
||||
|
||||
bool Create(wxDocument *doc,
|
||||
wxView *view,
|
||||
|
@@ -65,7 +65,7 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
wxDocument(wxDocument *parent = (wxDocument *) NULL);
|
||||
~wxDocument();
|
||||
virtual ~wxDocument();
|
||||
|
||||
// accessors
|
||||
void SetFilename(const wxString& filename, bool notifyViews = false);
|
||||
@@ -175,7 +175,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
|
||||
public:
|
||||
// wxView(wxDocument *doc = (wxDocument *) NULL);
|
||||
wxView();
|
||||
~wxView();
|
||||
virtual ~wxView();
|
||||
|
||||
wxDocument *GetDocument() const { return m_viewDocument; }
|
||||
virtual void SetDocument(wxDocument *doc);
|
||||
@@ -249,7 +249,7 @@ public:
|
||||
wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
|
||||
long flags = wxDEFAULT_TEMPLATE_FLAGS);
|
||||
|
||||
~wxDocTemplate();
|
||||
virtual ~wxDocTemplate();
|
||||
|
||||
// By default, these two member functions dynamically creates document and
|
||||
// view using dynamic instance construction. Override these if you need a
|
||||
@@ -315,7 +315,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true);
|
||||
~wxDocManager();
|
||||
virtual ~wxDocManager();
|
||||
|
||||
virtual bool Initialize();
|
||||
|
||||
@@ -468,7 +468,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long type = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxT("frame"));
|
||||
~wxDocChildFrame(){}
|
||||
virtual ~wxDocChildFrame(){}
|
||||
|
||||
// Extend event processing to search the view's event table
|
||||
virtual bool ProcessEvent(wxEvent& event);
|
||||
@@ -559,7 +559,7 @@ class WXDLLEXPORT wxFileHistory : public wxObject
|
||||
{
|
||||
public:
|
||||
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
|
||||
~wxFileHistory();
|
||||
virtual ~wxFileHistory();
|
||||
|
||||
// Operations
|
||||
virtual void AddFileToHistory(const wxString& file);
|
||||
|
@@ -54,7 +54,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
|
||||
public:
|
||||
|
||||
wxEncodingConverter();
|
||||
~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
|
||||
virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
|
||||
|
||||
// Initialize conversion. Both output or input encoding may
|
||||
// be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.
|
||||
|
@@ -1185,7 +1185,7 @@ public:
|
||||
g_isPainting++;
|
||||
}
|
||||
|
||||
~wxPaintEvent()
|
||||
virtual ~wxPaintEvent()
|
||||
{
|
||||
g_isPainting--;
|
||||
}
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
|
||||
{
|
||||
public:
|
||||
wxMemoryFSHandlerBase();
|
||||
~wxMemoryFSHandlerBase();
|
||||
virtual ~wxMemoryFSHandlerBase();
|
||||
|
||||
// Add file to list of files stored in memory. Stored data (bitmap, text or
|
||||
// raw data) will be copied into private memory stream and available under
|
||||
|
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
|
||||
virtual wxString FindFirst(const wxString& spec, int flags = 0);
|
||||
virtual wxString FindNext();
|
||||
void Cleanup();
|
||||
~wxZipFSHandler();
|
||||
virtual ~wxZipFSHandler();
|
||||
|
||||
private:
|
||||
// these vars are used by FindFirst/Next:
|
||||
|
@@ -541,7 +541,7 @@ public:
|
||||
#if !wxUSE_STL
|
||||
wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
|
||||
#endif
|
||||
~wxResourceCache();
|
||||
virtual ~wxResourceCache();
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
@@ -30,7 +30,7 @@ public:
|
||||
wxColour& operator=(const wxColour& col);
|
||||
|
||||
// dtor
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
// accessors
|
||||
bool Ok() const { return m_isInit; }
|
||||
|
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_ADV wxDataViewCell: public wxDataViewCellBase
|
||||
{
|
||||
public:
|
||||
wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||
~wxDataViewCell();
|
||||
virtual ~wxDataViewCell();
|
||||
|
||||
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
|
||||
virtual wxSize GetSize() = 0;
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
wxDataViewProgressCell( const wxString &label = wxEmptyString,
|
||||
const wxString &varianttype = wxT("long"),
|
||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||
~wxDataViewProgressCell();
|
||||
virtual ~wxDataViewProgressCell();
|
||||
|
||||
bool SetValue( const wxVariant &value );
|
||||
|
||||
|
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
|
||||
public:
|
||||
// creating the control
|
||||
wxDatePickerCtrlGeneric() { Init(); }
|
||||
~wxDatePickerCtrlGeneric() ;
|
||||
virtual ~wxDatePickerCtrlGeneric() ;
|
||||
wxDatePickerCtrlGeneric(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxDateTime& date = wxDefaultDateTime,
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
wxPostScriptDC(const wxPrintData& printData);
|
||||
|
||||
// Recommended destructor :-)
|
||||
~wxPostScriptDC();
|
||||
virtual ~wxPostScriptDC();
|
||||
|
||||
virtual bool Ok() const;
|
||||
|
||||
|
@@ -60,7 +60,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData
|
||||
{
|
||||
public:
|
||||
wxDirItemData(const wxString& path, const wxString& name, bool isDir);
|
||||
~wxDirItemData(){}
|
||||
virtual ~wxDirItemData(){}
|
||||
void SetNewDirName(const wxString& path);
|
||||
|
||||
bool HasSubDirs() const;
|
||||
@@ -225,7 +225,7 @@ public:
|
||||
|
||||
void Init();
|
||||
|
||||
~wxDirFilterListCtrl() {}
|
||||
virtual ~wxDirFilterListCtrl() {}
|
||||
|
||||
//// Operations
|
||||
void FillFilterList(const wxString& filter, int defaultFilter);
|
||||
|
@@ -151,7 +151,7 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
~wxGenericDragImage();
|
||||
virtual ~wxGenericDragImage();
|
||||
|
||||
// Attributes
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
|
||||
{
|
||||
public:
|
||||
wxExtHelpController(wxWindow* parentWindow = NULL);
|
||||
~wxExtHelpController();
|
||||
virtual ~wxExtHelpController();
|
||||
|
||||
/** Tell it which browser to use.
|
||||
The Netscape support will check whether Netscape is already
|
||||
|
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxGenericImageList: public wxObject
|
||||
public:
|
||||
wxGenericImageList() { m_width = m_height = 0; }
|
||||
wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
|
||||
~wxGenericImageList();
|
||||
virtual ~wxGenericImageList();
|
||||
bool Create( int width, int height, bool mask = true, int initialCount = 1 );
|
||||
bool Create();
|
||||
|
||||
|
@@ -77,7 +77,7 @@ public:
|
||||
{
|
||||
Create(parent, winid, pos, size, style, validator, name);
|
||||
}
|
||||
~wxGenericListCtrl();
|
||||
virtual ~wxGenericListCtrl();
|
||||
|
||||
bool Create( wxWindow *parent,
|
||||
wxWindowID winid = wxID_ANY,
|
||||
|
@@ -90,7 +90,7 @@ public:
|
||||
bool bShow = true, // show window immediately?
|
||||
bool bPassToOld = true); // pass messages to the old target?
|
||||
|
||||
~wxLogWindow();
|
||||
virtual ~wxLogWindow();
|
||||
|
||||
// window operations
|
||||
// show/hide the log window
|
||||
|
@@ -48,7 +48,7 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
~wxGenericMDIParentFrame();
|
||||
virtual ~wxGenericMDIParentFrame();
|
||||
bool Create( wxWindow *parent,
|
||||
wxWindowID winid,
|
||||
const wxString& title,
|
||||
@@ -230,7 +230,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
|
||||
public:
|
||||
wxGenericMDIClientWindow();
|
||||
wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
|
||||
~wxGenericMDIClientWindow();
|
||||
virtual ~wxGenericMDIClientWindow();
|
||||
virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
|
||||
|
||||
virtual int SetSelection(size_t nPage);
|
||||
|
@@ -52,7 +52,7 @@ public:
|
||||
long style = 0,
|
||||
const wxString& name = wxNotebookNameStr);
|
||||
// dtor
|
||||
~wxNotebook();
|
||||
virtual ~wxNotebook();
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
|
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
|
||||
|
||||
wxPalette();
|
||||
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
|
||||
~wxPalette();
|
||||
virtual ~wxPalette();
|
||||
bool operator == ( const wxPalette& palette ) const;
|
||||
bool operator != ( const wxPalette& palette ) const;
|
||||
virtual bool Ok() const;
|
||||
|
@@ -44,7 +44,7 @@ public:
|
||||
/* Destructor.
|
||||
Re-enables event handling for other windows.
|
||||
*/
|
||||
~wxProgressDialog();
|
||||
virtual ~wxProgressDialog();
|
||||
|
||||
/* Update the status bar to the new value.
|
||||
@param value new value
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight);
|
||||
wxRegionGeneric(const wxRect& rect);
|
||||
wxRegionGeneric();
|
||||
~wxRegionGeneric();
|
||||
virtual ~wxRegionGeneric();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
wxRegionIteratorGeneric();
|
||||
wxRegionIteratorGeneric(const wxRegionGeneric& region);
|
||||
wxRegionIteratorGeneric(const wxRegionIteratorGeneric& iterator);
|
||||
~wxRegionIteratorGeneric();
|
||||
virtual ~wxRegionIteratorGeneric();
|
||||
|
||||
wxRegionIteratorGeneric& operator=(const wxRegionIteratorGeneric& iterator);
|
||||
|
||||
|
@@ -87,7 +87,7 @@ public:
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
|
||||
~wxSashWindow();
|
||||
virtual ~wxSashWindow();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("sashWindow"));
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
|
||||
~wxSplashScreen();
|
||||
virtual ~wxSplashScreen();
|
||||
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnNotify(wxTimerEvent& event);
|
||||
|
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxTabControl: public wxObject
|
||||
DECLARE_DYNAMIC_CLASS(wxTabControl)
|
||||
public:
|
||||
wxTabControl(wxTabView *v = (wxTabView *) NULL);
|
||||
~wxTabControl(void);
|
||||
virtual ~wxTabControl(void);
|
||||
|
||||
virtual void OnDraw(wxDC& dc, bool lastInRow);
|
||||
void SetLabel(const wxString& str) { m_controlLabel = str; }
|
||||
@@ -99,7 +99,7 @@ class WXDLLEXPORT wxTabView: public wxObject
|
||||
DECLARE_DYNAMIC_CLASS(wxTabView)
|
||||
public:
|
||||
wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
|
||||
~wxTabView();
|
||||
virtual ~wxTabView();
|
||||
|
||||
inline int GetNumberOfLayers() const { return m_layers.GetCount(); }
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
@@ -270,87 +270,93 @@ protected:
|
||||
* A dialog box class that is tab-friendly
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxTabbedDialog: public wxDialog
|
||||
class WXDLLEXPORT wxTabbedDialog : public wxDialog
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
|
||||
DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
|
||||
|
||||
public:
|
||||
wxTabbedDialog(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long windowStyle = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
virtual ~wxTabbedDialog();
|
||||
|
||||
wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr);
|
||||
~wxTabbedDialog(void);
|
||||
wxTabView *GetTabView() const { return m_tabView; }
|
||||
void SetTabView(wxTabView *v) { m_tabView = v; }
|
||||
|
||||
inline wxTabView *GetTabView() const { return m_tabView; }
|
||||
inline void SetTabView(wxTabView *v) { m_tabView = v; }
|
||||
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
|
||||
protected:
|
||||
wxTabView* m_tabView;
|
||||
wxTabView* m_tabView;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
/*
|
||||
* A panel class that is tab-friendly
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxTabbedPanel: public wxPanel
|
||||
class WXDLLEXPORT wxTabbedPanel : public wxPanel
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
|
||||
DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
|
||||
|
||||
public:
|
||||
wxTabbedPanel(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long windowStyle = 0,
|
||||
const wxString& name = wxPanelNameStr);
|
||||
virtual ~wxTabbedPanel();
|
||||
|
||||
wxTabbedPanel(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long windowStyle = 0, const wxString& name = wxPanelNameStr);
|
||||
~wxTabbedPanel(void);
|
||||
wxTabView *GetTabView() const { return m_tabView; }
|
||||
void SetTabView(wxTabView *v) { m_tabView = v; }
|
||||
|
||||
inline wxTabView *GetTabView() const { return m_tabView; }
|
||||
inline void SetTabView(wxTabView *v) { m_tabView = v; }
|
||||
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
|
||||
protected:
|
||||
wxTabView* m_tabView;
|
||||
wxTabView* m_tabView;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
|
||||
wxIntToWindowHashMap);
|
||||
|
||||
class WXDLLEXPORT wxPanelTabView: public wxTabView
|
||||
class WXDLLEXPORT wxPanelTabView : public wxTabView
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxPanelTabView)
|
||||
DECLARE_DYNAMIC_CLASS(wxPanelTabView)
|
||||
|
||||
public:
|
||||
wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
|
||||
~wxPanelTabView(void);
|
||||
wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
|
||||
virtual ~wxPanelTabView(void);
|
||||
|
||||
// Called when a tab is activated
|
||||
virtual void OnTabActivate(int activateId, int deactivateId);
|
||||
// Called when a tab is activated
|
||||
virtual void OnTabActivate(int activateId, int deactivateId);
|
||||
|
||||
// Specific to this class
|
||||
void AddTabWindow(int id, wxWindow *window);
|
||||
wxWindow *GetTabWindow(int id) const ;
|
||||
void ClearWindows(bool deleteWindows = true);
|
||||
inline wxWindow *GetCurrentWindow() const { return m_currentWindow; }
|
||||
// Specific to this class
|
||||
void AddTabWindow(int id, wxWindow *window);
|
||||
wxWindow *GetTabWindow(int id) const ;
|
||||
void ClearWindows(bool deleteWindows = true);
|
||||
wxWindow *GetCurrentWindow() const { return m_currentWindow; }
|
||||
|
||||
void ShowWindowForTab(int id);
|
||||
// inline wxList& GetWindows() const { return (wxList&) m_tabWindows; }
|
||||
void ShowWindowForTab(int id);
|
||||
// wxList& GetWindows() const { return (wxList&) m_tabWindows; }
|
||||
|
||||
protected:
|
||||
// List of panels, one for each tab. Indexed
|
||||
// by tab ID.
|
||||
wxIntToWindowHashMap m_tabWindows;
|
||||
wxWindow* m_currentWindow;
|
||||
wxPanel* m_panel;
|
||||
// List of panels, one for each tab. Indexed
|
||||
// by tab ID.
|
||||
wxIntToWindowHashMap m_tabWindows;
|
||||
wxWindow* m_currentWindow;
|
||||
wxPanel* m_panel;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual bool Start(int millisecs = -1, bool oneShot = false);
|
||||
virtual void Stop();
|
||||
|
@@ -26,7 +26,7 @@ public:
|
||||
wxMask( const wxBitmap& bitmap, int paletteIndex );
|
||||
#endif // wxUSE_PALETTE
|
||||
wxMask( const wxBitmap& bitmap );
|
||||
~wxMask();
|
||||
virtual ~wxMask();
|
||||
|
||||
bool Create( const wxBitmap& bitmap, const wxColour& colour );
|
||||
#if wxUSE_PALETTE
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
|
||||
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
|
||||
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
|
||||
~wxBitmap();
|
||||
virtual ~wxBitmap();
|
||||
bool operator == ( const wxBitmap& bmp ) const;
|
||||
bool operator != ( const wxBitmap& bmp ) const;
|
||||
bool Ok() const;
|
||||
|
@@ -24,7 +24,7 @@ public:
|
||||
|
||||
wxBrush( const wxColour &colour, int style = wxSOLID );
|
||||
wxBrush( const wxBitmap &stippleBitmap );
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
|
||||
Create(parent, id, pos, size, choices, style, validator, name);
|
||||
}
|
||||
~wxChoice();
|
||||
virtual ~wxChoice();
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
|
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
|
||||
{
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
wxColour(const GdkColor& gdkColor);
|
||||
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -42,7 +42,7 @@ public:
|
||||
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||
}
|
||||
|
||||
~wxComboBox();
|
||||
virtual ~wxComboBox();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
wxCursor( const char bits[], int width, int height,
|
||||
int hotSpotX=-1, int hotSpotY=-1,
|
||||
const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
bool operator == ( const wxCursor& cursor ) const;
|
||||
bool operator != ( const wxCursor& cursor ) const;
|
||||
bool Ok() const;
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxBitmapDataObject(const wxBitmap& bitmap);
|
||||
|
||||
// destr
|
||||
~wxBitmapDataObject();
|
||||
virtual ~wxBitmapDataObject();
|
||||
|
||||
// override base class virtual to update PNG data too
|
||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||
|
@@ -85,7 +85,7 @@ public:
|
||||
wxDataViewCustomCell( const wxString &varianttype = wxT("string"),
|
||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
|
||||
bool no_init = false );
|
||||
~wxDataViewCustomCell();
|
||||
virtual ~wxDataViewCustomCell();
|
||||
bool Init();
|
||||
|
||||
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
wxDataViewProgressCell( const wxString &label = wxEmptyString,
|
||||
const wxString &varianttype = wxT("long"),
|
||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||
~wxDataViewProgressCell();
|
||||
virtual ~wxDataViewProgressCell();
|
||||
|
||||
bool SetValue( const wxVariant &value );
|
||||
|
||||
|
@@ -70,7 +70,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase
|
||||
{
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC() { }
|
||||
virtual ~wxDC() { }
|
||||
|
||||
#if wxUSE_PALETTE
|
||||
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
|
||||
public:
|
||||
wxMemoryDC();
|
||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||
~wxMemoryDC();
|
||||
virtual ~wxMemoryDC();
|
||||
virtual void SelectObject( const wxBitmap& bitmap );
|
||||
|
||||
// these get reimplemented for mono-bitmaps to behave
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
const wxSize &size = wxDefaultSize,
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString &name = wxDialogNameStr );
|
||||
~wxDialog() {}
|
||||
virtual ~wxDialog() {}
|
||||
|
||||
virtual bool Show( bool show = TRUE );
|
||||
virtual int ShowModal();
|
||||
|
@@ -49,7 +49,7 @@ public:
|
||||
// wxGTK-specific
|
||||
bool Create(const wxString& fontname);
|
||||
|
||||
~wxFont();
|
||||
virtual ~wxFont();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
|
@@ -66,7 +66,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */
|
||||
);
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
void SetCurrent();
|
||||
void SetColour(const wxChar *colour);
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
int *attribList = (int*) NULL,
|
||||
const wxPalette& palette = wxNullPalette );
|
||||
|
||||
~wxGLCanvas();
|
||||
virtual ~wxGLCanvas();
|
||||
|
||||
void SetCurrent();
|
||||
void SetColour(const wxChar *colour);
|
||||
|
@@ -98,7 +98,7 @@ public:
|
||||
wxGnomePrintDialog( wxWindow *parent,
|
||||
wxPrintDialogData* data = NULL );
|
||||
wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);
|
||||
~wxGnomePrintDialog();
|
||||
virtual ~wxGnomePrintDialog();
|
||||
|
||||
wxPrintData& GetPrintData()
|
||||
{ return m_printDialogData.GetPrintData(); }
|
||||
@@ -138,7 +138,7 @@ class wxGnomePageSetupDialog: public wxPageSetupDialogBase
|
||||
public:
|
||||
wxGnomePageSetupDialog( wxWindow *parent,
|
||||
wxPageSetupDialogData* data = NULL );
|
||||
~wxGnomePageSetupDialog();
|
||||
virtual ~wxGnomePageSetupDialog();
|
||||
|
||||
virtual wxPageSetupDialogData& GetPageSetupDialogData();
|
||||
|
||||
@@ -198,7 +198,7 @@ class wxGnomePrintDC: public wxDC
|
||||
{
|
||||
public:
|
||||
wxGnomePrintDC( wxGnomePrinter *printer );
|
||||
~wxGnomePrintDC();
|
||||
virtual ~wxGnomePrintDC();
|
||||
|
||||
bool Ok() const;
|
||||
|
||||
|
@@ -33,7 +33,7 @@ public:
|
||||
(void)Create(parent, id, title, pos, size, style, name);
|
||||
}
|
||||
|
||||
~wxMDIParentFrame();
|
||||
virtual ~wxMDIParentFrame();
|
||||
bool Create( wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxString& title,
|
||||
@@ -183,7 +183,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
|
||||
public:
|
||||
wxMDIClientWindow();
|
||||
wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
|
||||
~wxMDIClientWindow();
|
||||
virtual ~wxMDIClientWindow();
|
||||
virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
|
||||
|
||||
private:
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
const wxString& help = wxEmptyString,
|
||||
wxItemKind kind = wxITEM_NORMAL,
|
||||
wxMenu *subMenu = (wxMenu *)NULL);
|
||||
~wxMenuItem();
|
||||
virtual ~wxMenuItem();
|
||||
|
||||
// implement base class virtuals
|
||||
virtual void SetText( const wxString& str );
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
const wxString& caption = wxMessageBoxCaptionStr,
|
||||
long style = wxOK|wxCENTRE,
|
||||
const wxPoint& pos = wxDefaultPosition);
|
||||
~wxMessageDialog();
|
||||
virtual ~wxMessageDialog();
|
||||
|
||||
int ShowModal();
|
||||
virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
wxPen() { }
|
||||
|
||||
wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
|
||||
~wxPen();
|
||||
virtual ~wxPen();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
virtual ~wxRegion();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -41,7 +41,7 @@ public:
|
||||
long style = wxSB_HORIZONTAL,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxScrollBarNameStr );
|
||||
~wxScrollBar();
|
||||
virtual ~wxScrollBar();
|
||||
int GetThumbPosition() const;
|
||||
int GetThumbSize() const;
|
||||
int GetPageSize() const;
|
||||
|
@@ -28,7 +28,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxTextCtrlNameStr);
|
||||
|
||||
~wxTextCtrl();
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
|
||||
virtual void Stop();
|
||||
|
@@ -40,7 +40,7 @@ public:
|
||||
wxMask( const wxBitmap& bitmap, int paletteIndex );
|
||||
#endif // wxUSE_PALETTE
|
||||
wxMask( const wxBitmap& bitmap );
|
||||
~wxMask();
|
||||
virtual ~wxMask();
|
||||
|
||||
bool Create( const wxBitmap& bitmap, const wxColour& colour );
|
||||
#if wxUSE_PALETTE
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
|
||||
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
|
||||
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
|
||||
~wxBitmap();
|
||||
virtual ~wxBitmap();
|
||||
bool operator == ( const wxBitmap& bmp ) const;
|
||||
bool operator != ( const wxBitmap& bmp ) const;
|
||||
bool Ok() const;
|
||||
|
@@ -34,7 +34,7 @@ public:
|
||||
|
||||
wxBrush( const wxColour &colour, int style = wxSOLID );
|
||||
wxBrush( const wxBitmap &stippleBitmap );
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
|
||||
Create(parent, id, pos, size, choices, style, validator, name);
|
||||
}
|
||||
~wxChoice();
|
||||
virtual ~wxChoice();
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
|
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
|
||||
{
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
|
@@ -41,7 +41,7 @@ public:
|
||||
wxColour() { }
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
virtual bool FromString(const wxChar *str);
|
||||
|
||||
|
@@ -61,7 +61,7 @@ public:
|
||||
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||
}
|
||||
|
||||
~wxComboBox();
|
||||
virtual ~wxComboBox();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
|
@@ -34,7 +34,7 @@ public:
|
||||
wxCursor( const char bits[], int width, int height,
|
||||
int hotSpotX=-1, int hotSpotY=-1,
|
||||
const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
bool operator == ( const wxCursor& cursor ) const;
|
||||
bool operator != ( const wxCursor& cursor ) const;
|
||||
bool Ok() const;
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxBitmapDataObject(const wxBitmap& bitmap);
|
||||
|
||||
// destr
|
||||
~wxBitmapDataObject();
|
||||
virtual ~wxBitmapDataObject();
|
||||
|
||||
// override base class virtual to update PNG data too
|
||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||
|
@@ -39,7 +39,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase
|
||||
{
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC() { }
|
||||
virtual ~wxDC() { }
|
||||
|
||||
#if wxUSE_PALETTE
|
||||
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
|
||||
public:
|
||||
wxMemoryDC();
|
||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||
~wxMemoryDC();
|
||||
virtual ~wxMemoryDC();
|
||||
virtual void SelectObject( const wxBitmap& bitmap );
|
||||
void DoGetSize( int *width, int *height ) const;
|
||||
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
const wxSize &size = wxDefaultSize,
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString &name = wxDialogNameStr );
|
||||
~wxDialog() {}
|
||||
virtual ~wxDialog() {}
|
||||
|
||||
void OnApply( wxCommandEvent &event );
|
||||
void OnCancel( wxCommandEvent &event );
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
// wxGTK-specific
|
||||
bool Create(const wxString& fontname);
|
||||
|
||||
~wxFont();
|
||||
virtual ~wxFont();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
|
@@ -66,7 +66,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */
|
||||
);
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
void SetCurrent();
|
||||
void SetColour(const wxChar *colour);
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
int *attribList = (int*) NULL,
|
||||
const wxPalette& palette = wxNullPalette );
|
||||
|
||||
~wxGLCanvas();
|
||||
virtual ~wxGLCanvas();
|
||||
|
||||
void SetCurrent();
|
||||
void SetColour(const wxChar *colour);
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user