Applied wxImage -> wxCursor patch, tool window event table fix

[wxWidgets.git] / include / wx / univ / inpcons.h

diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h
index bd099c0cd0cd72109ce88379fa63347113f0be1d..1077ed8979731f201d8824b64d1eaed0b36a94fb 100644 (file)
--- a/include/wx/univ/inpcons.h
+++ b/include/wx/univ/inpcons.h
@@ -90,7 +90,9 @@ private: \
     void OnKeyDown(wxKeyEvent& event); \
     void OnKeyUp(wxKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \
     void OnKeyDown(wxKeyEvent& event); \
     void OnKeyUp(wxKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \

-    void OnActivate(wxActivateEvent& event);
+public: /* because of docview :-( */ \
+    void OnActivate(wxActivateEvent& event); \
+private:

 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \
 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \


@@ -136,5 +138,4 @@ private: \
         wxInputConsumer::OnActivate(event); \
     }
 
         wxInputConsumer::OnActivate(event); \
     }
 

-

 #endif // _WX_UNIV_INPCONS_H_
 #endif // _WX_UNIV_INPCONS_H_