fixing osx_cocoa

[wxWidgets.git] / src / common / artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index c4e34e7912f550e06eba21f19d72e1563dde822d..542247d4ae68a147b110769af3c9db5b61aec8e1 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -20,6 +20,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_ARTPROVIDER_STD
+

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


@@ -93,6 +95,8 @@ protected:
 #include "../../art/helpicon.xpm"
 #include "../../art/tipicon.xpm"
 #include "../../art/home.xpm"
 #include "../../art/helpicon.xpm"
 #include "../../art/tipicon.xpm"
 #include "../../art/home.xpm"

+#include "../../art/first.xpm"
+#include "../../art/last.xpm"

 #include "../../art/repview.xpm"
 #include "../../art/listview.xpm"
 #include "../../art/new_dir.xpm"
 #include "../../art/repview.xpm"
 #include "../../art/listview.xpm"
 #include "../../art/new_dir.xpm"


@@ -117,6 +121,9 @@ protected:
 #include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"
 #include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"

+#include "../../art/plus.xpm"
+#include "../../art/minus.xpm"
+#include "../../art/close.xpm"

 #include "../../art/quit.xpm"
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
 #include "../../art/quit.xpm"
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"


@@ -148,6 +155,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_GO_DOWN,                             down)
     ART(wxART_GO_TO_PARENT,                        toparent)
     ART(wxART_GO_HOME,                             home)
     ART(wxART_GO_DOWN,                             down)
     ART(wxART_GO_TO_PARENT,                        toparent)
     ART(wxART_GO_HOME,                             home)

+    ART(wxART_GOTO_FIRST,                          first)
+    ART(wxART_GOTO_LAST,                           last)

     ART(wxART_FILE_OPEN,                           fileopen)
     ART(wxART_PRINT,                               print)
     ART(wxART_HELP,                                helpicon)
     ART(wxART_FILE_OPEN,                           fileopen)
     ART(wxART_PRINT,                               print)
     ART(wxART_HELP,                                helpicon)


@@ -175,6 +184,9 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)
     ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)

+    ART(wxART_PLUS,                                plus)
+    ART(wxART_MINUS,                               minus)
+    ART(wxART_CLOSE,                               close)

     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)
     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)


@@ -195,7 +207,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
 #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
 #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

-    if (bmp.Ok())
+    if (bmp.IsOk())

     {
         // fit into transparent image with desired size hint from the client
         if (reqSize == wxDefaultSize)
     {
         // fit into transparent image with desired size hint from the client
         if (reqSize == wxDefaultSize)


@@ -209,7 +221,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {

-                    // the caller wants default size, which is larger than 
+                    // the caller wants default size, which is larger than

                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);


@@ -236,3 +248,5 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 
     return bmp;
 }
 
     return bmp;
 }

+
+#endif // wxUSE_ARTPROVIDER_STD