Include wxCocoa specific header

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 91ff9dcec04dfd26ae63b1c1af5219bd970a8c0f..f0e8f7782b24a5e0019bdc24d71fdca930291fea 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -88,6 +88,8 @@ private:
     #include "wx/gtk/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/bmpbuttn.h"
 #endif

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 1d34cf702efd1a5673ed49ac63806a42fe31d95d..f8e708e7e58f406633cbc971e997f111d49a91eb 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/brush.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/brush.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
 #include "wx/os2/brush.h"
 #endif

diff --git a/include/wx/button.h b/include/wx/button.h
index 3eee1463c23541a951621fd11769299821d3d620..93ba18b25052ae896aa621079ef6c7f3fc066b0a 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -70,6 +70,8 @@ public:
     #include "wx/gtk/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
 #endif

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 510619aa00547c77f9c179efaaba8e5cb9049552..c8a126923e20fa4074fb9b04e5615568d40a1b34 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -42,6 +42,8 @@ public:
     #include "wx/gtk/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
 #endif

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 9d12caaa5a1d51d42dc6561849ece97dfe1ffd0b..22f76f3812bcb81fc9babd221e188726802ef357 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -38,6 +38,8 @@ public:
     #include "wx/gtk/checklst.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checklst.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checklst.h"
 #endif

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6b252d92a6b21811b3a3410a63e7c43fcb806a13..7ffaab5f148c5f441024402d0ed4e001cff3df5f 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -70,6 +70,8 @@ public:
     #include "wx/gtk/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
 #endif

diff --git a/include/wx/colour.h b/include/wx/colour.h
index e600e671ad81521fb3bae8455570723e22f841b7..a8d43815993899f92f9c928dcdb440e7255f54ba 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -13,6 +13,8 @@
 #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/colour.h"
 #elif defined(__WXPM__)
 #include "wx/os2/colour.h"
 #endif

diff --git a/include/wx/control.h b/include/wx/control.h
index 9493c91e48f09ef3160e38219641d03d77f87903..578d5262241d44f05fa9a618e5754bdff148db15 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -82,6 +82,8 @@ protected:
     #include "wx/gtk/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/control.h"
 #elif defined(__WXPM__)
     #include "wx/os2/control.h"
 #endif

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index 14e5e25deaa647483514e3bd31ec10cbc6f25c32..4f845c6605b207a0878eb4ecb6c94342fdcfb3be 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/cursor.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
 #include "wx/os2/cursor.h"
 #endif

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index c66cc1602ee2d65424985080357f5f3c301fd231..30990302d274e83b5fe1148831008e33892e642e 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/dcclient.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcclient.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcclient.h"
 #elif defined(__WXPM__)
 #include "wx/os2/dcclient.h"
 #endif

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 928681010cdca66ab710de18558a7de69ff05cff..44bf096afca1970742758e2ee4abf70b68775c02 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcmemory.h"
 #elif defined(__WXPM__)
 #include "wx/os2/dcmemory.h"
 #endif

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 430e2ef6f553d4f7f2ecc23723178cda79323416..268b42cec108889fc0096cc4768e21831a1dd5f6 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/dcscreen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcscreen.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcscreen.h"
 #elif defined(__WXPM__)
 #include "wx/os2/dcscreen.h"
 #endif

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 5324bc17bb1695f002cb6c760f04580f5a27920a..e1afd445d9e6ab106601d525fade717bed9505b4 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -64,6 +64,8 @@ protected:
         #include "wx/gtk/dialog.h"
     #elif defined(__WXMAC__)
         #include "wx/mac/dialog.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)
         #include "wx/os2/dialog.h"
     #endif

diff --git a/include/wx/font.h b/include/wx/font.h
index eb6d7f8b843cfb5a7763185e27ed1b876bed43ea..e1c2c1044a409d45c245f6101efa5d3e5f870e49 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -221,6 +221,8 @@ private:
     #include "wx/mgl/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)
     #include "wx/os2/font.h"
 #endif

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 83c19b2a4bd9b923229d1df0f80249b84acb2114..c7fc61217a95a11c5209bb9cbe95bf161cdf78b5 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -230,6 +230,8 @@ protected:
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
         #include "wx/mac/frame.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)
         #include "wx/os2/frame.h"
     #endif

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 61944f156476f7a68d6fd73f131172a0316b1c66..916a339bc095ff8867498b268c8ac32e0154e214 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/gdiobj.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/gdiobj.h"
 #elif defined(__WXPM__)
 #include "wx/os2/gdiobj.h"
 #endif

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 91aca9710b27e744dc501e5255b3e9e99637c234..6d892226290caa2bc22bf086faa7112f0903edd3 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -19,6 +19,8 @@
   #include "wx/mgl/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
+#elif defined(__WXCOCOA__)
+  #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
   #include "wx/os2/icon.h"
 #endif

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index d06528cd4577a2e3fa925ce808d7620b267897e7..4e56164b3d119b5b7a9cb7f8dbc267b3605856ad 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -135,6 +135,8 @@ protected:
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/listbox.h"
 #endif
 
 #endif // wxUSE_LISTBOX

diff --git a/include/wx/menu.h b/include/wx/menu.h
index fe2642cdcd9d41dd846b5cc45e1f110278796154..12ed13942567a88abd5b63260071171b4b5d6872 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -539,6 +539,8 @@ protected:
     #include "wx/gtk/menu.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menu.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)
     #include "wx/os2/menu.h"
 #endif

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 8d469a7838421e367fac8314e6b638b430cf3dd9..48e98922be3df44df32f3f1e8198123de4ca72c5 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -161,6 +161,8 @@ private:
     #include "wx/gtk/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)
     #include "wx/os2/menuitem.h"
 #endif

diff --git a/include/wx/pen.h b/include/wx/pen.h
index d4603f714dab72e677563f8ba785e92c1301e30b..9a5fb32e1cc44bd18ac26a82e5623b3862d7283b 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)
 #include "wx/os2/pen.h"
 #endif

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 6c850b5dfd2f65effc6431d84d229287dfbcda6e..ae289ad9c31221e5d63ecfddf876625b1d78b552 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -104,6 +104,8 @@ public:
     #include "wx/gtk/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
 #endif

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index d555d50e0eb5e2c9fb0d838862850bf22d6f7bb7..19ff88091b5948c2eb4ec74afc162287a365a464 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -43,6 +43,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
     #include "wx/gtk/radiobut.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobut.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobut.h"
 #endif

diff --git a/include/wx/region.h b/include/wx/region.h
index 9af617867e9d9a9a705e657a2b8c6473ab126b80..09d1500623eb2ca547415f3a838e937da6f7a6ab 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -13,6 +13,8 @@
 #include "wx/mgl/region.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/region.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/region.h"
 #elif defined(__WXPM__)
 #include "wx/os2/region.h"
 #endif

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 3b5cc2890639b059de2ea6651c7d2b9818821ddb..e78a347b7e3716f22a5d2df0b26bc2755bfc7338 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -54,6 +54,8 @@ protected:
     #include "wx/gtk/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statbmp.h"
 #endif

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 61b9d166cea57e389c539020044f6f53d3e3a63c..7effb7b4a219f5b8efaefb2ed3958946e8ca0f70 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -28,6 +28,8 @@ public:
 #include "wx/gtk/statbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/statbox.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
 #include "wx/os2/statbox.h"
 #endif

diff --git a/include/wx/statline.h b/include/wx/statline.h
index f660c5d94365d0d5bfd6bb7676f3555479a203ba..d3757e45cf99ea36df024dccc7113bf05d7ec40e 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -88,6 +88,8 @@ protected:
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statline.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
     #include "wx/generic/statline.h"
 #endif

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 827427c80af54a77d027a0ebd8b42a30d549d520..60fd8ede0a0d424e06a444371f196140696d1987 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -24,6 +24,8 @@ public:
     #include "wx/gtk/stattext.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/stattext.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"
 #endif

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 87a26d54df6f56334187e218715a3789e4deff72..cee3bcad453d224d8ca805b3791adae22125db6b 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -305,6 +305,8 @@ protected:
     #include "wx/gtk/textctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/textctrl.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/textctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/textctrl.h"
 #endif

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 28398f1b9d5b8884a4bbae5db066bc732e0648c0..1beeb7ac80b362af5ee4362c75a749ca5741b38b 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -170,6 +170,9 @@ protected:
 #elif defined(__WXMAC__)
     #include "wx/mac/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowCocoa
 #elif defined(__WXPM__)
     #include "wx/os2/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowOS2

diff --git a/include/wx/window.h b/include/wx/window.h
index a4d36b3e6e66e1c410fa2cfc32f8eb6ab8035a56..ea437b4c3961ec15457a32eb7caca0059efe8780 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1155,6 +1155,14 @@ private:
         #define sm_classwxWindowMac sm_classwxWindow
     #endif // wxUniv
     #include "wx/mac/window.h"
+#elif defined(__WXCOCOA__)
+    #ifdef __WXUNIVERSAL__
+        #define wxWindowNative wxWindowCocoa
+    #else // !wxUniv
+        #define wxWindowCocoa wxWindow
+        #define sm_classwxWindowCocoa sm_classwxWindow
+    #endif // wxUniv
+    #include "wx/cocoa/window.h"
 #elif defined(__WXPM__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowOS2