From 901a462fd537d432127b4f765cd2a1032639d584 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 20 Dec 2007 06:08:00 +0000 Subject: [PATCH] make access for virtuals match base git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/dataview.h | 15 +++++---------- include/wx/statbox.h | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index 1cb8787e83..293ff6e141 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -7,13 +7,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDATAVIEWCTRLH__ -#define __GTKDATAVIEWCTRLH__ +#ifndef _WX_GTKDATAVIEWCTRL_H_ +#define _WX_GTKDATAVIEWCTRL_H_ -#include "wx/defs.h" -#include "wx/object.h" #include "wx/list.h" -#include "wx/control.h" // --------------------------------------------------------- // classes @@ -409,6 +406,8 @@ public: GtkWidget *GtkGetTreeView() { return m_treeview; } wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; } + virtual void OnInternalIdle(); + protected: virtual void DoSetExpanderColumn(); virtual void DoSetIndent(); @@ -424,16 +423,12 @@ private: wxDataViewCtrlInternal *m_internal; wxDataViewColumnList m_cols; - - virtual void OnInternalIdle(); - void GtkEnableSelectionEvents(); void GtkDisableSelectionEvents(); -private: DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) DECLARE_NO_COPY_CLASS(wxDataViewCtrl) }; -#endif // __GTKDATAVIEWCTRLH__ +#endif // _WX_GTKDATAVIEWCTRL_H_ diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 7eee31685e..873e5d15e5 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -46,7 +46,7 @@ public: *borderOther = BORDER; } -private: +protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } -- 2.45.2