Change the access of the event handler functions for Patch #1185584

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 04caf5a5dad6651dce39d8d8a3ac634e1f8ded11..f797285132d6f16dd11f79b1b558ac1884bc7410 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -2954,7 +2954,7 @@ public:
 
 
 #ifndef SWIG
 
 
 #ifndef SWIG

-private:
+protected:

     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);


@@ -2983,6 +2983,7 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 

+private:

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 323e0f3c3f2293bf78a66c17a1a165d3085fb38b..0df1ebccf055bb0416ce156114005095616dc971 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -265,7 +265,7 @@ public:
 
 
 #ifndef SWIG
 
 
 #ifndef SWIG

-private:
+protected:

     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);


@@ -294,6 +294,7 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 

+private:

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 04caf5a5dad6651dce39d8d8a3ac634e1f8ded11..f797285132d6f16dd11f79b1b558ac1884bc7410 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -2954,7 +2954,7 @@ public:
 
 
 #ifndef SWIG
 
 
 #ifndef SWIG

-private:
+protected:

     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);


@@ -2983,6 +2983,7 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 

+private:

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 323e0f3c3f2293bf78a66c17a1a165d3085fb38b..0df1ebccf055bb0416ce156114005095616dc971 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -265,7 +265,7 @@ public:
 
 
 #ifndef SWIG
 
 
 #ifndef SWIG

-private:
+protected:

     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);


@@ -294,6 +294,7 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 

+private:

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)