Made icons configurable via a wxMApp virtual function. Tested on wxGTK only,

added it for all ports, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/defs.h

@@ -402,7 +402,7 @@ enum
   wxMGL_UNIX,               // MGL with direct hardware access
   wxMGL_X,                  // MGL on X 
   wxMGL_WIN32,              // MGL on Win32
-  wxMGL_OS2,                // MGL on OS/2
+  wxMGL_OS2                 // MGL on OS/2
 };
 
 // ----------------------------------------------------------------------------
@@ -862,6 +862,8 @@ typedef  wxUint16        wxWord;
 
 #define wxICON_EXCLAMATION      0x00000040
 #define wxICON_HAND             0x00000080
+#define wxICON_WARNING          wxICON_EXCLAMATION
+#define wxICON_ERROR            wxICON_HAND
 #define wxICON_QUESTION         0x00000100
 #define wxICON_INFORMATION      0x00000200
 #define wxICON_STOP             wxICON_HAND

include/wx/generic/error.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * error[] = {
+static char * error_xpm[] = {
 "48 48 78 1",
 " 	c None",
 ".	c #000000",

include/wx/generic/info.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * info[] = {
+static char * info_xpm[] = {
 "48 48 159 2",
 "  	c None",
 ". 	c #12165C",

include/wx/generic/question.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * question[] = {
+static char * question_xpm[] = {
 "48 48 165 2",
 "  	c None",
 ". 	c #000000",

include/wx/generic/warning.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char * warning[] = {
+static char * warning_xpm[] = {
 "48 48 151 2",
 "  	c None",
 ". 	c #C70707",

include/wx/gtk/app.h

@@ -17,6 +17,7 @@
 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -81,6 +82,9 @@ class wxApp: public wxEvtHandler
     virtual bool Pending();
     virtual void Dispatch();
 
+    /** Returns the standard icons for the msg dialogs, implemented in 
+        src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+    virtual wxIcon GetStdIcon(int which) const;
     inline void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
     inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
 

include/wx/gtk1/app.h

@@ -17,6 +17,7 @@
 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -81,6 +82,9 @@ class wxApp: public wxEvtHandler
     virtual bool Pending();
     virtual void Dispatch();
 
+    /** Returns the standard icons for the msg dialogs, implemented in 
+        src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+    virtual wxIcon GetStdIcon(int which) const;
     inline void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
     inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
 

include/wx/mac/app.h

@@ -67,6 +67,11 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
+
+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
+
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 

include/wx/motif/app.h

@@ -67,6 +67,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
+
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 

include/wx/msw/app.h

@@ -19,6 +19,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"
+#include "wx/icon.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
@@ -67,6 +68,9 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   // Called to set off the main loop
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
 
   // called when a fatal exception occurs, this function should take care not
   // to do anything which might provoke a nested exception!

include/wx/qt/app.h

@@ -68,6 +68,9 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   // Called to set off the main loop
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
 
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }

include/wx/stubs/app.h

@@ -67,6 +67,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
+
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }