Switches OS/2 back to generic ListCtrl and TreeCtrl as those compile and

        link at least (and problems with generic controls needs fixing anyway).

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 9b8b7753e63ad53fc8d9c15546b6bf86466f61ba..2dcc13e3fe685191c9b8b0eb518f17fa23a9aa3d 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1357,6 +1357,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/imaglist.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/imaglist.cpp

+    src/generic/listctrl.cpp

     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp


@@ -1400,7 +1401,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/icon.cpp
     src/os2/iniconf.cpp
     src/os2/listbox.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
     src/os2/listbox.cpp

-    src/os2/listctrl.cpp

     src/os2/main.cpp
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
     src/os2/menuitem.cpp


@@ -1430,7 +1430,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp

-    src/os2/treectrl.cpp

     src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>
     src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>


@@ -1439,6 +1438,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h

+    wx/generic/listctrl.h

     wx/generic/mdig.h
     wx/generic/statusbr.h
     wx/os2/accel.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
     wx/os2/accel.h


@@ -1476,7 +1476,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/icon.h
     wx/os2/iniconf.h
     wx/os2/listbox.h
     wx/os2/icon.h
     wx/os2/iniconf.h
     wx/os2/listbox.h

-    wx/os2/listctrl.h

     wx/os2/menu.h
     wx/os2/menuitem.h
     wx/os2/metafile.h
     wx/os2/menu.h
     wx/os2/menuitem.h
     wx/os2/metafile.h


@@ -1508,7 +1507,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h

-    wx/msw/treectrl.h

     wx/os2/window.h
 </set>
 
     wx/os2/window.h
 </set>
 

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 02da28c588226311ac1563fd0f85345941853252..445e448c662c6baac57a0e4cc4b24a0d642d0299 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -26,8 +26,6 @@
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"

-#elif defined(__WXPM__)
-    #include "wx/os2/listctrl.h"

 #else
     #include "wx/generic/listctrl.h"
 #endif
 #else
     #include "wx/generic/listctrl.h"
 #endif

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index fe92ae504cad43cfe6c92ebfaedb602c3e48c770..4ba0dc7821a9550b79b00758d3a7a1a37456196a 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -24,7 +24,7 @@
 #elif defined(__WXCOCOA__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)

-    #include "wx/os2/treectrl.h"
+    #include "wx/generic/treectlg.h"

 #endif
 
 /*
 #endif
 
 /*