]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/treectrl.h
Applied rowspan patch #15276 (dghart)
[wxWidgets.git] / include / wx / os2 / treectrl.h
index 46f497cf89db599d63dbb37b220b981057b01315..4a1f678d2026ebbd0fc5b21b8de9c617792f84ec 100644 (file)
@@ -442,13 +442,13 @@ public:
     // interface compatibility, only.
     //
     wxTextCtrl* EditLabel( const wxTreeItemId& rItem
-                          ,wxClassInfo*        pTextCtrlClass = CLASSINFO(wxTextCtrl)
+                          ,wxClassInfo*        pTextCtrlClass = wxCLASSINFO(wxTextCtrl)
                          );
 
     //
     // returns NULL for OS/2 in ALL cases
     //
-    wxTextCtrl* GetEditControl(void) const {return (wxTextCtrl*)NULL;}
+    wxTextCtrl* GetEditControl(void) const {return NULL;}
 
     //
     // End editing and accept or discard the changes to item label
@@ -586,7 +586,7 @@ private:
                          ,int                 nImage
                          ,int                 nImageSel
                         );
-    void DeleteTextCtrl() { };
+    void DeleteTextCtrl() { }
 
     //
     // support for additional item images which we implement using
@@ -624,7 +624,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
 }; // end of CLASS wxTreeCtrl
 
 #endif // wxUSE_TREECTRL