AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make access for virtuals match base

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2008-11-16 18:20:21 +00:00
parent a09307abba
commit 470f357fd2
7 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/bmpcbox.h
View File

@ -125,9 +125,9 @@ public:
virtual bool IsEditable() const;
virtual void SetEditable(bool editable);
protected:
virtual GtkWidget* GetConnectWidget();
protected:
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
virtual void GTKCreateComboBoxWidget();

5
include/wx/gtk/msgdlg.h
View File

@ -31,6 +31,8 @@ protected:
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height)) {}
// override to convert wx mnemonics to GTK+ ones and handle stock ids
virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);
private:
// override to use stock GTK+ defaults instead of just string ones
@ -39,9 +41,6 @@ private:
virtual wxString GetDefaultOKLabel() const;
virtual wxString GetDefaultCancelLabel() const;
// override to convert wx mnemonics to GTK+ ones and handle stock ids
virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);
// create the real GTK+ dialog: this is done from ShowModal() to allow
// changing the message between constructing the dialog and showing it
void GTKCreateMsgDialog();

4
include/wx/odcombo.h
View File

@ -307,8 +307,6 @@ public:
}
// wxControlWithItems methods
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
@ -335,6 +333,8 @@ public:
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
protected:
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
// Callback for drawing. Font, background and text colour have been
// prepared according to selection, focus and such.

10
include/wx/propgrid/manager.h
View File

@ -442,10 +442,12 @@ public:
*/
int GetPageByState( const wxPropertyGridPageState* pstate ) const;
protected:
/** Returns wxPropertyGridPageState of given page, current page's for -1.
*/
virtual wxPropertyGridPageState* GetPageState( int page ) const;
public:
/** Returns number of managed pages. */
size_t GetPageCount() const;
@ -610,15 +612,13 @@ protected:
*/
virtual wxPropertyGrid* CreatePropertyGrid() const;
virtual void RefreshProperty( wxPGProperty* p );
public:
virtual void RefreshProperty( wxPGProperty* p );
//
// Overridden functions - no documentation required.
//
virtual wxSize DoGetBestSize() const;
void SetId( wxWindowID winid );
virtual void Freeze();
@ -628,11 +628,13 @@ public:
virtual void SetWindowStyleFlag ( long style );
protected:
virtual wxSize DoGetBestSize() const;
public:
#ifndef SWIG
virtual bool ProcessEvent( wxEvent& event );
//
// Event handlers
//
@ -727,8 +729,6 @@ protected:
virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
virtual wxVariant GetEditableStateItem( const wxString& name ) const;
virtual bool ProcessEvent( wxEvent& event );
private:
DECLARE_EVENT_TABLE()
#endif // #ifndef SWIG

8
include/wx/propgrid/propgrid.h
View File

@ -1327,6 +1327,9 @@ public:
*/
bool UnfocusEditor();
virtual bool ProcessEvent(wxEvent& event);
virtual void SetWindowStyleFlag( long style );
protected:
/**
@ -1375,7 +1378,6 @@ public:
// Overridden functions.
virtual bool Destroy();
virtual wxSize DoGetBestSize() const;
// Returns property at given y coordinate (relative to grid's top left).
wxPGProperty* GetItemAtY( int y ) const { return DoGetItemAtY(y); }
@ -1391,6 +1393,7 @@ public:
protected:
virtual wxSize DoGetBestSize() const;
#ifndef wxPG_ICON_WIDTH
wxBitmap *m_expandbmp, *m_collbmp;
@ -1792,9 +1795,6 @@ protected:
void CustomSetCursor( int type, bool override = false );
virtual bool ProcessEvent(wxEvent& event);
virtual void SetWindowStyleFlag( long style );
/**
Repositions scrollbar and underlying panel according to changed virtual
size.

2
include/wx/propgrid/props.h
View File

@ -302,10 +302,10 @@ public:
wxPGValidationInfo* pValidationInfo,
int mode =
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
virtual wxValidator* DoGetValidator () const;
protected:
int m_precision;
virtual wxValidator* DoGetValidator () const;
};
// -----------------------------------------------------------------------

44
include/wx/weakref.h
View File

@ -59,6 +59,13 @@ public:
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT(m_pobj != NULL);
m_pobj = NULL;
}
protected:
void Assign(T* pobj)
{
@ -82,13 +89,6 @@ protected:
Assign( wr.m_pobj );
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT( m_pobj!=NULL );
m_pobj = NULL;
}
T *m_pobj;
};
@ -122,6 +122,14 @@ struct wxWeakRefImpl<T, false> : public wxTrackerNode
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT(m_pobj != NULL);
m_pobj = NULL;
m_ptbase = NULL;
}
protected:
wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
@ -177,14 +185,6 @@ protected:
}
}
virtual void OnObjectDestroy()
{
// Tracked object itself removes us from list of trackers
wxASSERT( m_pobj!=NULL );
m_pobj = NULL;
m_ptbase = NULL;
}
T *m_pobj;
wxTrackable *m_ptbase;
};
@ -293,6 +293,13 @@ public:
}
}
virtual void OnObjectDestroy()
{
wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
m_pobj = NULL;
}
protected:
void Assign(T *pobj)
{
@ -320,13 +327,6 @@ protected:
}
}
virtual void OnObjectDestroy()
{
wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
m_pobj = NULL;
}
T *m_pobj;
};