attributes inheritance fix; apply style to both m_wxwindow and m_widget (patch 984858)

[wxWidgets.git] / src / cocoa / utils.cpp

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 2670e8e7385a0ba02824855fe4b0d647b4e5facd..ef9413bec6193c4d3d61bf0e869736d630df8952 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -13,6 +13,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"

+#include "wx/display.h"

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 


@@ -22,6 +23,11 @@
 #include <stdarg.h>
 
 // Get size of display
 #include <stdarg.h>
 
 // Get size of display

+size_t wxDisplayBase::GetCount()
+{
+    return 1;
+}
+

 void wxDisplaySize(int *width, int *height)
 {
     // TODO
 void wxDisplaySize(int *width, int *height)
 {
     // TODO


@@ -49,6 +55,15 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height)
         *height=768;
 }
 
         *height=768;
 }
 

+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+    info.shortName = _T("cocoa");
+    info.name = _T("wxCocoa");
+    // TODO: Finish this
+    return info;
+}
+

 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {


@@ -75,7 +90,7 @@ void wxBell()
 }
 
 #if 0
 }
 
 #if 0

-// DFE: These aren't even implemented by wxGTK, and no wxWindows code calls
+// DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls

 // them.  If someone needs them, then they'll get a link error
 
 // Consume all events until no more left
 // them.  If someone needs them, then they'll get a link error
 
 // Consume all events until no more left