implemented (more) correct <pre> handling

[wxWidgets.git] / include / wx / stubs / treectrl.h

diff --git a/include/wx/stubs/treectrl.h b/include/wx/stubs/treectrl.h
index c107fdc8ba6df818d88da60967982246dae2f369..14fac525fc449cf5f98275e498f5ed0e7d5e3aa0 100644 (file)
--- a/include/wx/stubs/treectrl.h
+++ b/include/wx/stubs/treectrl.h
@@ -190,7 +190,7 @@ public:
     }
 
       // bounding rect
     }
 
       // bounding rect

-    bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
+    bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const;

       //
     wxTextCtrl* GetEditControl() const;
     
       //
     wxTextCtrl* GetEditControl() const;
     


@@ -256,6 +256,7 @@ protected:
  wxEVT_COMMAND_TREE_KEY_DOWN
 */
 
  wxEVT_COMMAND_TREE_KEY_DOWN
 */
 

+#ifndef __WXMAC_X__

 class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
 {
   DECLARE_DYNAMIC_CLASS(wxTreeEvent)
 class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
 {
   DECLARE_DYNAMIC_CLASS(wxTreeEvent)


@@ -275,21 +276,7 @@ class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);

-
-#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#endif

 
 #endif
     // _WX_TREECTRL_H_
 
 #endif
     // _WX_TREECTRL_H_