fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / osx / artmac.cpp

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 548eb2ce970c42f56f936e40c1be247701e31f33..92e7cbee4e516253350ef9bd852a05e9a6f526d3 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -19,14 +19,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/artprov.h"
+

 #ifndef WX_PRECOMP
     #include "wx/image.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/image.h"
 #endif
 

-#if !defined(__WXUNIVERSAL__)
-
-#include "wx/artprov.h"
-#include "wx/image.h"
+#if wxOSX_USE_COCOA_OR_CARBON

 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider
 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider


@@ -109,6 +108,22 @@ wxBitmap wxMacArtProvider::CreateBitmap(const wxArtID& id,
     return wxNullBitmap;
 }
 
     return wxNullBitmap;
 }
 

-#endif // !defined(__WXUNIVERSAL__)

 
 

+// ----------------------------------------------------------------------------
+// wxArtProvider::GetNativeSizeHint()
+// ----------------------------------------------------------------------------
+
+/*static*/
+wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
+{
+    if ( client == wxART_TOOLBAR )
+    {
+        // See http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGIcons/chapter_15_section_9.html:
+        // "32 x 32 pixels is the recommended size"
+        return wxSize(32, 32);
+    }
+
+    return wxDefaultSize;
+}

 
 

+#endif // wxOSX_USE_COCOA_CARBON