Warning fixes, source cleaning.

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index fe55f9d2f3ae9ccb42893d64bcb9cdafefbc3182..23bbfb70530087d074a774248065b542b8f9cbaa 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -20,8 +20,13 @@
     #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/artprov.h"

-#include "wx/module.h"

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


@@ -34,28 +39,51 @@ 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);

-    
+
+// 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 ) \
+    { \
+        CREATE_STD_ICON(#iconId, xpmRc) \
+    }

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxDefaultArtProviderModule
+// wxArtProvider::InitStdProvider

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxDefaultArtProviderModule: public wxModule
+/*static*/ void wxArtProvider::InitStdProvider()

 {
 {

-public:
-    bool OnInit() 
-    {
-        wxArtProvider::PushProvider(new wxDefaultArtProvider);
-        return TRUE; 
-    }
-    void OnExit() {}
-
-    DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule)
-};
+    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -65,6 +93,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"


@@ -73,6 +113,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
     #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 
     #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 

+#include "../../art/missimg.xpm"

 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"
 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"


@@ -88,10 +129,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 #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"

+#include "../../art/harddisk.xpm"
+#include "../../art/cdrom.xpm"
+#include "../../art/floppy.xpm"
+#include "../../art/removable.xpm"

 #include "../../art/folder.xpm"
 #include "../../art/folder.xpm"

+#include "../../art/folder_open.xpm"

 #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
 


@@ -100,9 +148,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 // ----------------------------------------------------------------------------
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 // ----------------------------------------------------------------------------
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,

-                                            const wxArtClient& client,
-                                            const wxSize& size)
+                                            const wxArtClient& WXUNUSED(client),
+                                            const wxSize& WXUNUSED(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)


@@ -110,6 +165,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)
 #endif // wxUSE_HTML
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)
 #endif // wxUSE_HTML

+    ART(wxART_MISSING_IMAGE,                       missimg)

     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)
     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)


@@ -125,10 +181,17 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_REPORT_VIEW,                         repview)
     ART(wxART_LIST_VIEW,                           listview)
     ART(wxART_NEW_DIR,                             new_dir)
     ART(wxART_REPORT_VIEW,                         repview)
     ART(wxART_LIST_VIEW,                           listview)
     ART(wxART_NEW_DIR,                             new_dir)

+    ART(wxART_HARDDISK,                            harddisk)
+    ART(wxART_FLOPPY,                              floppy)
+    ART(wxART_CDROM,                               cdrom)
+    ART(wxART_REMOVABLE,                           removable)

     ART(wxART_FOLDER,                              folder)
     ART(wxART_FOLDER,                              folder)

+    ART(wxART_FOLDER_OPEN,                         folder_open)

     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;
 }