make access for virtuals match base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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.
|
||||
|
@@ -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;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user