fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 8b5b215034101e6686a5bed2f72b5cc3129479eb..3117191abad7c50aa35edd3eb39b273a7f5043ee 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/treectrl.h
+// Purpose:     wxTreeCtrl base header
+// Author:      Karsten Ballueder
+// Modified by:
+// Created:
+// Copyright:   (c) Karsten Ballueder
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_TREECTRL_H_BASE_
 #define _WX_TREECTRL_H_BASE_
 
 #ifndef _WX_TREECTRL_H_BASE_
 #define _WX_TREECTRL_H_BASE_
 


@@ -9,28 +20,25 @@
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"

+#elif defined(__WXPALMOS__)
+        #include "wx/palmos/treectrl.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-    #ifdef __WIN16__
-        #include "wx/generic/treectlg.h"
-    #else

         #include "wx/msw/treectrl.h"
         #include "wx/msw/treectrl.h"

-    #endif

 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"

-#elif defined(__WXPM__)
+#elif defined(__WXCOCOA__)

     #include "wx/generic/treectlg.h"
     #include "wx/generic/treectlg.h"

-#elif defined(__WXSTUBS__)
+#elif defined(__WXPM__)

     #include "wx/generic/treectlg.h"
 #endif
 
 /*
 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl
     #include "wx/generic/treectlg.h"
 #endif
 
 /*
 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl

-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl

 #endif
 */
 
 #endif
 */