]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/artstd.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...
[wxWidgets.git] / src / common / artstd.cpp
diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index bcd007fff3c67d08353151802305d5119b068bf9..dd3f13c1a63534df95942feb1e3bc198a052cdf5 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -13,10 +13,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "artprov.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -24,8 +20,14 @@
     #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"
+#include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
@@ -34,32 +36,55 @@
 class wxDefaultArtProvider : public wxArtProvider
 {
 protected:
 class wxDefaultArtProvider : public wxArtProvider
 {
 protected:
-    virtual wxBitmap CreateBitmap(const wxArtDomain& domain, 
-                                  const wxArtID& id, const wxSize& size);
+    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
+                                  const wxSize& size);
 };
 
 };
 
-#define BEGIN_DOMAIN(domainId) if ( domain == domainId ) {
-#define END_DOMAIN()           }
-#define ART_ID(artId, xpmRc)   if ( id == artId ) return wxBitmap(xpmRc##_xpm);
-
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// wxDefaultArtProviderModule
+// helper macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-class wxDefaultArtProviderModule: public wxModule
-{
-public:
-    bool OnInit() 
-    {
-        wxArtProvider::PushProvider(new wxDefaultArtProvider);
-        return TRUE; 
+// Standard macro for getting a resource from XPM file:
+#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) \
     }
     }
-    void OnExit() {}
 
 
-    DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule)
-};
+// ----------------------------------------------------------------------------
+// wxArtProvider::InitStdProvider
+// ----------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
+/*static*/ void wxArtProvider::InitStdProvider()
+{
+    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+}
+
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif
 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
@@ -69,65 +94,137 @@ 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
 #if wxUSE_HTML
-#include "../../art/wxhtml/addbookm.xpm"
-#include "../../art/wxhtml/delbookm.xpm"
-#include "../../art/wxhtml/navig.xpm"
-#include "../../art/wxhtml/settings.xpm"
-#include "../../art/wxhtml/book.xpm"
-#include "../../art/wxhtml/folder.xpm"
-#include "../../art/wxhtml/page.xpm"
+    #include "../../art/htmsidep.xpm"
+    #include "../../art/htmoptns.xpm"
+    #include "../../art/htmbook.xpm"
+    #include "../../art/htmfoldr.xpm"
+    #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 
 #endif // wxUSE_HTML
 
-#include "../../art/browser/back.xpm"
-#include "../../art/browser/forward.xpm"
-#include "../../art/browser/up.xpm"
-#include "../../art/browser/down.xpm"
-#include "../../art/browser/toparent.xpm"
+#include "../../art/missimg.xpm"
+#include "../../art/addbookm.xpm"
+#include "../../art/delbookm.xpm"
+#include "../../art/back.xpm"
+#include "../../art/forward.xpm"
+#include "../../art/up.xpm"
+#include "../../art/down.xpm"
+#include "../../art/toparent.xpm"
+#include "../../art/fileopen.xpm"
+#include "../../art/print.xpm"
+#include "../../art/helpicon.xpm"
+#include "../../art/tipicon.xpm"
+#include "../../art/home.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_open.xpm"
+#include "../../art/dir_up.xpm"
+#include "../../art/exefile.xpm"
+#include "../../art/deffile.xpm"
+#include "../../art/tick.xpm"
+#include "../../art/cross.xpm"
 
 
-#include "../../art/toolbar/fileopen.xpm"
-#include "../../art/toolbar/print.xpm"
+#undef static
 
 
-#include "../../art/framicon/help.xpm"
+wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
+{
+    // 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)
 
 
-#undef static
+    // standard icons:
+#if wxUSE_HTML
+    ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
+    ART(wxART_HELP_SETTINGS,                       htmoptns)
+    ART(wxART_HELP_BOOK,                           htmbook)
+    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_GO_FORWARD,                          forward)
+    ART(wxART_GO_UP,                               up)
+    ART(wxART_GO_DOWN,                             down)
+    ART(wxART_GO_TO_PARENT,                        toparent)
+    ART(wxART_GO_HOME,                             home)
+    ART(wxART_FILE_OPEN,                           fileopen)
+    ART(wxART_PRINT,                               print)
+    ART(wxART_HELP,                                helpicon)
+    ART(wxART_TIP,                                 tipicon)
+    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_OPEN,                         folder_open)
+    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;
+}
 
 // ----------------------------------------------------------------------------
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 
-wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtDomain& domain, 
-                                            const wxArtID& id,
-                                            const wxSize& size)
+wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
+                                            const wxArtClient& client,
+                                            const wxSize& reqSize)
 {
 {
-#if wxUSE_HTML
-    BEGIN_DOMAIN(wxART_WXHTML)
-        ART_ID(wxART_ADD_BOOKMARK,     addbookm)
-        ART_ID(wxART_DEL_BOOKMARK,     delbookm)
-        ART_ID(wxART_NAVIG_PANEL,      navig)
-        ART_ID(wxART_HELP_SETTINGS,    settings)
-        ART_ID(wxART_HELP_BOOK,        book)
-        ART_ID(wxART_HELP_FOLDER,      folder)
-        ART_ID(wxART_HELP_PAGE,        page)
-    END_DOMAIN()
-#endif // wxUSE_HTML
-
-    BEGIN_DOMAIN(wxART_BROWSER_TOOLBAR)
-        ART_ID(wxART_GO_BACK,          back)
-        ART_ID(wxART_GO_FORWARD,       forward)
-        ART_ID(wxART_GO_UP,            up)
-        ART_ID(wxART_GO_DOWN,          down)
-        ART_ID(wxART_GO_TO_PARENT,     toparent)
-    END_DOMAIN()
+    wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
 
-    BEGIN_DOMAIN(wxART_TOOLBAR)
-        ART_ID(wxART_FILE_OPEN,        fileopen)
-        ART_ID(wxART_PRINT,            print)
-    END_DOMAIN()
-
-    BEGIN_DOMAIN(wxART_FRAME_ICON)
-        ART_ID(wxART_HELP,             help)
-    END_DOMAIN()
+#if wxUSE_IMAGE
+    if (bmp.Ok())
+    {
+        // fit into transparent image with desired size hint from the client
+        if (reqSize == wxDefaultSize)
+        {
+            // find out if there is a desired size for this client
+            wxSize bestSize = GetSizeHint(client);
+            if (bestSize != wxDefaultSize)
+            {
+                int bmp_w = bmp.GetWidth();
+                int bmp_h = bmp.GetHeight();
+                // want default size but it's smaller, paste into transparent image
+                if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
+                {
+                    wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
+                    wxImage img = bmp.ConvertToImage();
+                    img.Resize(bestSize, offset);
+                    bmp = wxBitmap(img);
+                }
+            }
+        }
+    }
+#endif // wxUSE_IMAGE
 
 
-    return wxNullBitmap;
+    return bmp;
 }
 }
wxWidgets (Impactor)