Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make access for virtuals match base

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-12-20 06:08:00 +00:00
parent 18591d70d9
commit 901a462fd5
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/gtk/dataview.h
View File

@@ -7,13 +7,10 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __GTKDATAVIEWCTRLH__ #ifndef _WX_GTKDATAVIEWCTRL_H_
#define __GTKDATAVIEWCTRLH__ #define _WX_GTKDATAVIEWCTRL_H_
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"
#include "wx/control.h"
// --------------------------------------------------------- // ---------------------------------------------------------
// classes // classes
@@ -409,6 +406,8 @@ public:
GtkWidget *GtkGetTreeView() { return m_treeview; } GtkWidget *GtkGetTreeView() { return m_treeview; }
wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; } wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
virtual void OnInternalIdle();
protected: protected:
virtual void DoSetExpanderColumn(); virtual void DoSetExpanderColumn();
virtual void DoSetIndent(); virtual void DoSetIndent();
@@ -424,16 +423,12 @@ private:
wxDataViewCtrlInternal *m_internal; wxDataViewCtrlInternal *m_internal;
wxDataViewColumnList m_cols; wxDataViewColumnList m_cols;
virtual void OnInternalIdle();
void GtkEnableSelectionEvents(); void GtkEnableSelectionEvents();
void GtkDisableSelectionEvents(); void GtkDisableSelectionEvents();
private:
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
DECLARE_NO_COPY_CLASS(wxDataViewCtrl) DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
}; };
#endif // __GTKDATAVIEWCTRLH__ #endif // _WX_GTKDATAVIEWCTRL_H_

2
include/wx/statbox.h
View File

@@ -46,7 +46,7 @@ public:
*borderOther = BORDER; *borderOther = BORDER;
} }
private: protected:
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }