Fix wxListCtrl background colour bug Part I

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index fe55f9d2f3ae9ccb42893d64bcb9cdafefbc3182..cc08b0d756c8faa8410dc00cb7d58cf40b22b5ba 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -20,9 +20,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #if WXWIN_COMPATIBILITY_2_2
+        #include "wx/app.h"
+    #endif
+#endif
+

 #include "wx/artprov.h"
 #include "wx/module.h"
 
 #include "wx/artprov.h"
 #include "wx/module.h"
 

+// For the purposes of forcing this module to link
+char g_ArtProviderModule = 0;
+

 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------


@@ -34,9 +43,54 @@ protected:
                                   const wxSize& size);
 };
 
                                   const wxSize& size);
 };
 

+// ----------------------------------------------------------------------------
+// helper macros
+// ----------------------------------------------------------------------------
+
+// Standard macro for getting a resource from XPM file:

 #define ART(artId, xpmRc) \
     if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 #define ART(artId, xpmRc) \
     if ( id == artId ) return wxBitmap(xpmRc##_xpm);

-    
+
+// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
+#if WXWIN_COMPATIBILITY_2_2
+    #define GET_STD_ICON_FROM_APP(iconId) \
+        if ( client == wxART_MESSAGE_BOX ) \
+        { \
+            wxIcon icon = wxTheApp->GetStdIcon(iconId); \
+            if ( icon.Ok() ) \
+            { \
+                wxBitmap bmp; \
+                bmp.CopyFromIcon(icon); \
+                return bmp; \
+            } \
+        }
+#else
+    #define GET_STD_ICON_FROM_APP(iconId)
+#endif
+
+// There are two ways of getting the standard icon: either via XPMs or via
+// wxIcon ctor. This depends on the platform:
+#if defined(__WXUNIVERSAL__)
+    #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+    #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
+#else
+    #define CREATE_STD_ICON(iconId, xpmRc) \
+        { \
+            wxIcon icon(_T(iconId)); \
+            wxBitmap bmp; \
+            bmp.CopyFromIcon(icon); \
+            return bmp; \
+        }
+#endif
+
+// Macro used in CreateBitmap to get wxICON_FOO icons:
+#define ART_MSGBOX(artId, iconId, xpmRc) \
+    if ( id == artId ) \
+    { \
+        GET_STD_ICON_FROM_APP(iconId) \
+        CREATE_STD_ICON(#iconId, xpmRc) \
+    }

 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProviderModule
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProviderModule


@@ -65,6 +119,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 // XPM hack: make the arrays const
 #define static static const
 
 // XPM hack: make the arrays const
 #define static static const
 

+#if defined(__WXGTK__)
+    #include "../../art/gtk/info.xpm"
+    #include "../../art/gtk/error.xpm"
+    #include "../../art/gtk/warning.xpm"
+    #include "../../art/gtk/question.xpm"
+#elif defined(__WXMOTIF__)
+    #include "../../art/motif/info.xpm"
+    #include "../../art/motif/error.xpm"
+    #include "../../art/motif/warning.xpm"
+    #include "../../art/motif/question.xpm"
+#endif
+

 #if wxUSE_HTML
     #include "../../art/htmsidep.xpm"
     #include "../../art/htmoptns.xpm"
 #if wxUSE_HTML
     #include "../../art/htmsidep.xpm"
     #include "../../art/htmoptns.xpm"


@@ -92,6 +158,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 #include "../../art/dir_up.xpm"
 #include "../../art/exefile.xpm"
 #include "../../art/deffile.xpm"
 #include "../../art/dir_up.xpm"
 #include "../../art/exefile.xpm"
 #include "../../art/deffile.xpm"

+#include "../../art/tick.xpm"
+#include "../../art/cross.xpm"

 
 #undef static
 
 
 #undef static
 


@@ -103,6 +171,13 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
                                             const wxArtClient& client,
                                             const wxSize& size)
 {
                                             const wxArtClient& client,
                                             const wxSize& size)
 {

+    // wxMessageBox icons:
+    ART_MSGBOX(wxART_ERROR,       wxICON_ERROR,       error)
+    ART_MSGBOX(wxART_INFORMATION, wxICON_INFORMATION, info)
+    ART_MSGBOX(wxART_WARNING,     wxICON_WARNING,     warning)
+    ART_MSGBOX(wxART_QUESTION,    wxICON_QUESTION,    question)
+
+    // standard icons:

 #if wxUSE_HTML
     ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
     ART(wxART_HELP_SETTINGS,                       htmoptns)
 #if wxUSE_HTML
     ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
     ART(wxART_HELP_SETTINGS,                       htmoptns)


@@ -129,6 +204,8 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_GO_DIR_UP,                           dir_up)
     ART(wxART_EXECUTABLE_FILE,                     exefile)
     ART(wxART_NORMAL_FILE,                         deffile)
     ART(wxART_GO_DIR_UP,                           dir_up)
     ART(wxART_EXECUTABLE_FILE,                     exefile)
     ART(wxART_NORMAL_FILE,                         deffile)

+    ART(wxART_TICK_MARK,                           tick)
+    ART(wxART_CROSS_MARK,                          cross)

 
     return wxNullBitmap;
 }
 
     return wxNullBitmap;
 }