From e64df9bcc331d49d05a6dc7729ee08071e4c6408 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Sat, 22 Mar 2003 06:18:36 +0000
Subject: [PATCH] Include wxCocoa specific header

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/bmpbuttn.h | 2 ++
 include/wx/brush.h    | 2 ++
 include/wx/button.h   | 2 ++
 include/wx/checkbox.h | 2 ++
 include/wx/checklst.h | 2 ++
 include/wx/choice.h   | 2 ++
 include/wx/colour.h   | 2 ++
 include/wx/control.h  | 2 ++
 include/wx/cursor.h   | 2 ++
 include/wx/dcclient.h | 2 ++
 include/wx/dcmemory.h | 2 ++
 include/wx/dcscreen.h | 2 ++
 include/wx/dialog.h   | 2 ++
 include/wx/font.h     | 2 ++
 include/wx/frame.h    | 2 ++
 include/wx/gdiobj.h   | 2 ++
 include/wx/icon.h     | 2 ++
 include/wx/listbox.h  | 2 ++
 include/wx/menu.h     | 2 ++
 include/wx/menuitem.h | 2 ++
 include/wx/pen.h      | 2 ++
 include/wx/radiobox.h | 2 ++
 include/wx/radiobut.h | 2 ++
 include/wx/region.h   | 2 ++
 include/wx/statbmp.h  | 2 ++
 include/wx/statbox.h  | 2 ++
 include/wx/statline.h | 2 ++
 include/wx/stattext.h | 2 ++
 include/wx/textctrl.h | 2 ++
 include/wx/toplevel.h | 3 +++
 include/wx/window.h   | 8 ++++++++
 31 files changed, 69 insertions(+)

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 91ff9dcec0..f0e8f7782b 100644
--- 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 1d34cf702e..f8e708e7e5 100644
--- 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 3eee1463c2..93ba18b250 100644
--- 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 510619aa00..c8a126923e 100644
--- 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 9d12caaa5a..22f76f3812 100644
--- 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 6b252d92a6..7ffaab5f14 100644
--- 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 e600e671ad..a8d4381599 100644
--- 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 9493c91e48..578d526224 100644
--- 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 14e5e25dea..4f845c6605 100644
--- 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 c66cc1602e..30990302d2 100644
--- 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 928681010c..44bf096afc 100644
--- 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 430e2ef6f5..268b42cec1 100644
--- 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 5324bc17bb..e1afd445d9 100644
--- 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 eb6d7f8b84..e1c2c1044a 100644
--- 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 83c19b2a4b..c7fc61217a 100644
--- 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 61944f1564..916a339bc0 100644
--- 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 91aca9710b..6d89222629 100644
--- 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 d06528cd45..4e56164b3d 100644
--- 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 fe2642cdcd..12ed139425 100644
--- 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 8d469a7838..48e98922be 100644
--- 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 d4603f714d..9a5fb32e1c 100644
--- 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 6c850b5dfd..ae289ad9c3 100644
--- 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 d555d50e0e..19ff88091b 100644
--- 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 9af617867e..09d1500623 100644
--- 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 3b5cc28906..e78a347b7e 100644
--- 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 61b9d166ce..7effb7b4a2 100644
--- 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 f660c5d943..d3757e45cf 100644
--- 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 827427c80a..60fd8ede0a 100644
--- 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 87a26d54df..cee3bcad45 100644
--- 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 28398f1b9d..1beeb7ac80 100644
--- 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 a4d36b3e6e..ea437b4c39 100644
--- 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