X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92c32bbee7cde97f465a5632734d63f050f5d550..e32454eadc5b3c1763b79b8d08e97ac4bb59992c:/src/osx/carbon/renderer.cpp

diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index ecae8ddd39..c8d11afd5d 100644
--- a/src/osx/carbon/renderer.cpp
+++ b/src/osx/carbon/renderer.cpp
@@ -30,14 +30,15 @@
 #include "wx/dcgraph.h"
 #include "wx/osx/private.h"
 
-#if wxOSX_USE_COCOA
-// bring in the theme headers
-#include <Carbon/Carbon.h>
-#endif
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+    #include "wx/image.h"
+    #include "wx/mstream.h"
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
 // check if we're currently in a paint event
 inline bool wxInPaintEvent(wxWindow* win, wxDC& dc)
 {
+    wxUnusedVar(dc);
     return ( win->MacGetCGContextRef() != NULL );
 }
 
@@ -75,7 +76,7 @@ public:
                               const wxRect& rect,
                               int flags = 0);
 
-    virtual wxSize GetCheckBoxSize() const;
+    virtual wxSize GetCheckBoxSize(wxWindow* win);
 
     virtual void DrawComboBoxDropButton(wxWindow *win,
                                         wxDC& dc,
@@ -100,7 +101,15 @@ public:
 
     virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
 
-    virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
 private:
     void DrawMacThemeButton(wxWindow *win,
@@ -381,7 +390,7 @@ wxRendererMac::DrawCheckBox(wxWindow *win,
                        kind, kThemeAdornmentNone);
 }
 
-wxSize wxRendererMac::GetCheckBoxSize() const
+wxSize wxRendererMac::GetCheckBoxSize(wxWindow* WXUNUSED(win))
 {
     wxSize size;
     SInt32 width, height;
@@ -500,7 +509,7 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc,
     DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone);
 }
 
-void wxRendererMac::DrawRadioButton(wxWindow* win, wxDC& dc,
+void wxRendererMac::DrawRadioBitmap(wxWindow* win, wxDC& dc,
                                 const wxRect& rect, int flags)
 {
     int kind;
@@ -561,3 +570,226 @@ void wxRendererMac::DrawTextCtrl(wxWindow* win, wxDC& dc,
     }
 }
 
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+
+void wxRendererMac::DrawTitleBarBitmap(wxWindow *win,
+                                       wxDC& dc,
+                                       const wxRect& rect,
+                                       wxTitleBarButton button,
+                                       int flags)
+{
+    // the files below were converted from the originals in art/osx/close*.png
+    // using misc/scripts/png2c.py script -- we must use PNG and not XPM for
+    // them because they use transparency and don't look right without it
+
+    /* close.png - 400 bytes */
+    static const unsigned char close_png[] = {
+      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+      0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0x48, 0x2d,
+      0xd1, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+      0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+      0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
+      0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00,
+      0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc,
+      0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x00, 0xb1, 0x5b, 0xf1, 0xf7, 0x00, 0x00, 0x00,
+      0xef, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0xa5,
+      0xd2, 0x31, 0x4a, 0x03, 0x41, 0x18, 0xc5, 0xf1,
+      0xdf, 0xc6, 0x55, 0x02, 0xb2, 0x18, 0xb0, 0x33,
+      0x8d, 0xd8, 0x6e, 0x8a, 0x14, 0xa6, 0xb2, 0xc9,
+      0x21, 0x72, 0x0b, 0xdb, 0x5c, 0x45, 0x98, 0x3b,
+      0x24, 0xc7, 0x99, 0x6d, 0x2d, 0x04, 0xd3, 0x09,
+      0x42, 0x48, 0x65, 0x60, 0x6c, 0x76, 0x65, 0x1c,
+      0x14, 0x45, 0x5f, 0x35, 0xfc, 0xe7, 0x3d, 0xe6,
+      0x9b, 0x8f, 0x57, 0xf9, 0xac, 0x06, 0x97, 0x98,
+      0xe0, 0xbc, 0x67, 0x07, 0xbc, 0xe2, 0x05, 0xfb,
+      0xc1, 0x58, 0x65, 0xa1, 0x2b, 0x4c, 0xb3, 0x40,
+      0xa9, 0x03, 0x9e, 0xb1, 0x83, 0x93, 0x2c, 0x74,
+      0x83, 0xb1, 0xef, 0x75, 0x86, 0x0b, 0x1c, 0xb1,
+      0x1f, 0xf5, 0xe3, 0x4d, 0x51, 0x43, 0x08, 0xe1,
+      0xb6, 0x4c, 0x64, 0xac, 0xee, 0xbd, 0x0d, 0x5c,
+      0x63, 0x89, 0x65, 0x08, 0x61, 0x9d, 0x52, 0x4a,
+      0x31, 0xc6, 0xcd, 0xc0, 0x62, 0x8c, 0x9b, 0x94,
+      0x52, 0x0a, 0x21, 0xac, 0x07, 0xd6, 0x67, 0xcc,
+      0x33, 0xf0, 0x61, 0x8c, 0x31, 0x6e, 0xf2, 0x73,
+      0xee, 0xc1, 0xbc, 0xc2, 0x1d, 0x4e, 0xf3, 0xd1,
+      0x62, 0x8c, 0xf7, 0x6d, 0xdb, 0xae, 0xa0, 0xeb,
+      0xba, 0xed, 0x6c, 0x36, 0x7b, 0x28, 0xa6, 0x7f,
+      0x1b, 0xf9, 0xa3, 0xea, 0x7e, 0xcd, 0x93, 0xf2,
+      0xb5, 0xae, 0xeb, 0xb6, 0xd0, 0xb6, 0xed, 0x2a,
+      0xc6, 0xa8, 0x78, 0xf5, 0xf0, 0xaf, 0xe5, 0x34,
+      0x58, 0xe4, 0xe1, 0x62, 0x11, 0x25, 0x5b, 0xa0,
+      0x19, 0x9a, 0x33, 0x14, 0xa0, 0xfe, 0xe1, 0x6b,
+      0x47, 0x3c, 0x62, 0x37, 0x34, 0x67, 0xdf, 0xc3,
+      0x71, 0xdf, 0x90, 0xaf, 0x74, 0xc0, 0x93, 0xbe,
+      0x72, 0x55, 0x71, 0xf9, 0xeb, 0x92, 0xbf, 0x03,
+      0x70, 0x33, 0x76, 0x58, 0xe5, 0x41, 0xfb, 0x6d,
+      0x00, 0x00, 0x00, 0x20, 0x7a, 0x54, 0x58, 0x74,
+      0x74, 0x69, 0x66, 0x66, 0x3a, 0x72, 0x6f, 0x77,
+      0x73, 0x2d, 0x70, 0x65, 0x72, 0x2d, 0x73, 0x74,
+      0x72, 0x69, 0x70, 0x00, 0x00, 0x78, 0xda, 0x33,
+      0xb5, 0x30, 0x05, 0x00, 0x01, 0x47, 0x00, 0xa3,
+      0x38, 0xda, 0x77, 0x3b, 0x00, 0x00, 0x00, 0x00,
+      0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+    };
+
+    /* close_current.png - 421 bytes */
+    static const unsigned char close_current_png[] = {
+      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+      0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0x48, 0x2d,
+      0xd1, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+      0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+      0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
+      0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00,
+      0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc,
+      0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x00, 0xb1, 0x5b, 0xf1, 0xf7, 0x00, 0x00, 0x01,
+      0x04, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x9d,
+      0xd2, 0xbd, 0x4a, 0x43, 0x31, 0x00, 0xc5, 0xf1,
+      0xdf, 0x8d, 0x56, 0x44, 0x04, 0x45, 0xd0, 0xc5,
+      0x55, 0xdc, 0x0a, 0x8e, 0xed, 0xec, 0xe4, 0xec,
+      0x24, 0xd4, 0x67, 0x29, 0x59, 0xfa, 0x16, 0x9d,
+      0x7c, 0x07, 0x1d, 0x5c, 0xba, 0xa5, 0xa3, 0x28,
+      0x22, 0x94, 0xae, 0x2e, 0x1d, 0x4a, 0x5d, 0x55,
+      0xb8, 0x2e, 0x09, 0x5c, 0x4b, 0xfd, 0xa0, 0x67,
+      0x0a, 0x27, 0x39, 0xc9, 0x49, 0xf2, 0xaf, 0x7c,
+      0xd7, 0x01, 0x8e, 0x71, 0x84, 0xfd, 0xec, 0x2d,
+      0x30, 0xc3, 0x2b, 0xe6, 0x65, 0x61, 0xd5, 0x08,
+      0x9d, 0xe0, 0x14, 0x7b, 0x56, 0xeb, 0x0d, 0x13,
+      0x4c, 0x61, 0xa3, 0x11, 0x3a, 0xc3, 0x8e, 0x9f,
+      0xb5, 0x9d, 0x9b, 0xbc, 0x63, 0x1e, 0x72, 0xbd,
+      0x53, 0xb4, 0x20, 0xc6, 0xd8, 0x5e, 0x4e, 0x34,
+      0xbc, 0x56, 0x5e, 0x7b, 0x00, 0x6d, 0x5c, 0xe1,
+      0x2a, 0xc6, 0x38, 0xa8, 0xeb, 0xba, 0x4e, 0x29,
+      0xdd, 0x16, 0x2f, 0xa5, 0x74, 0x5b, 0xd7, 0x75,
+      0x1d, 0x63, 0x1c, 0x14, 0x0f, 0xed, 0x0a, 0xe7,
+      0xb9, 0x02, 0x48, 0x29, 0x5d, 0x77, 0x3a, 0x9d,
+      0x8b, 0xf1, 0x78, 0x7c, 0x07, 0x65, 0xdc, 0xed,
+      0x76, 0x6f, 0x1a, 0x25, 0x66, 0x15, 0x2e, 0xb1,
+      0xd5, 0xac, 0x56, 0xc2, 0xb0, 0x22, 0x04, 0xef,
+      0xc1, 0x9a, 0xda, 0xcc, 0xff, 0xf4, 0x6b, 0xd5,
+      0x94, 0x92, 0xa5, 0x53, 0x17, 0x6b, 0x3f, 0xce,
+      0x06, 0x3e, 0x71, 0x88, 0xed, 0xd1, 0x68, 0x34,
+      0x0b, 0x21, 0x4c, 0x7a, 0xbd, 0xde, 0x7d, 0xd9,
+      0x7a, 0x38, 0x1c, 0x3e, 0x86, 0x10, 0x26, 0xfd,
+      0x7e, 0xff, 0xa9, 0x01, 0xc2, 0x4b, 0x21, 0xa7,
+      0x00, 0xd0, 0xfa, 0xe3, 0x6a, 0x1f, 0x78, 0xc0,
+      0xb4, 0x90, 0x33, 0xcf, 0x44, 0xec, 0x66, 0x42,
+      0x56, 0xe9, 0x0d, 0xcf, 0x32, 0x72, 0xd5, 0xd2,
+      0xe4, 0xbf, 0x21, 0xff, 0x02, 0x4d, 0xb5, 0x74,
+      0x79, 0x60, 0x9f, 0x78, 0x78, 0x00, 0x00, 0x00,
+      0x20, 0x7a, 0x54, 0x58, 0x74, 0x74, 0x69, 0x66,
+      0x66, 0x3a, 0x72, 0x6f, 0x77, 0x73, 0x2d, 0x70,
+      0x65, 0x72, 0x2d, 0x73, 0x74, 0x72, 0x69, 0x70,
+      0x00, 0x00, 0x78, 0xda, 0x33, 0xb5, 0x30, 0x05,
+      0x00, 0x01, 0x47, 0x00, 0xa3, 0x38, 0xda, 0x77,
+      0x3b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+      0x44, 0xae, 0x42, 0x60, 0x82};
+
+    /* close_pressed.png - 458 bytes */
+    static const unsigned char close_pressed_png[] = {
+      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+      0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0x48, 0x2d,
+      0xd1, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+      0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+      0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
+      0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00,
+      0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc,
+      0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
+      0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e,
+      0x00, 0xb1, 0x5b, 0xf1, 0xf7, 0x00, 0x00, 0x01,
+      0x29, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x9d,
+      0x92, 0x31, 0x6a, 0xc3, 0x40, 0x14, 0x44, 0x9f,
+      0x2c, 0xe1, 0xc2, 0x10, 0x08, 0xc4, 0xe0, 0x22,
+      0x76, 0x21, 0x04, 0x29, 0x13, 0xf0, 0x05, 0x54,
+      0xa5, 0x8a, 0x0f, 0xb2, 0x8d, 0x0e, 0xa0, 0x23,
+      0xa8, 0x56, 0xa3, 0x03, 0xe8, 0x08, 0xba, 0x80,
+      0xba, 0xb0, 0x45, 0x0a, 0x97, 0x02, 0x23, 0x58,
+      0x83, 0x40, 0x60, 0x61, 0x08, 0x11, 0x04, 0x57,
+      0x69, 0xf6, 0xc3, 0x46, 0x38, 0x24, 0x64, 0xca,
+      0xd9, 0x19, 0xe6, 0xff, 0xfd, 0xe3, 0xf1, 0x1d,
+      0x2b, 0x20, 0x02, 0x36, 0xc0, 0xd2, 0x72, 0x27,
+      0xe0, 0x08, 0x1c, 0x80, 0x5e, 0x84, 0x9e, 0x63,
+      0x7a, 0x04, 0xb6, 0xc0, 0x1d, 0xd7, 0x31, 0x00,
+      0x6f, 0xc0, 0x1e, 0xc0, 0x77, 0x4c, 0x31, 0x70,
+      0xc3, 0xcf, 0x58, 0xd8, 0x49, 0x3e, 0x81, 0x7e,
+      0x66, 0xc7, 0xdb, 0x02, 0x73, 0x80, 0xdd, 0x6e,
+      0xb7, 0x9a, 0x3a, 0x1c, 0x6e, 0x6e, 0xb5, 0x2b,
+      0x1f, 0x78, 0x02, 0x1e, 0x44, 0x90, 0x65, 0xd9,
+      0x8b, 0xef, 0xfb, 0xef, 0x5a, 0xeb, 0x33, 0x40,
+      0x92, 0x24, 0x51, 0x9a, 0xa6, 0xcf, 0xc6, 0x98,
+      0xae, 0x69, 0x9a, 0xd1, 0x26, 0x8f, 0x81, 0x8d,
+      0x07, 0xa0, 0xaa, 0xaa, 0x3e, 0x0c, 0xc3, 0x5a,
+      0x29, 0x15, 0x0b, 0xa7, 0x94, 0x8a, 0x8b, 0xa2,
+      0xa8, 0xab, 0xaa, 0xea, 0x9d, 0x21, 0x36, 0x81,
+      0xf3, 0x7b, 0x00, 0xe4, 0x79, 0x7e, 0x10, 0x03,
+      0x40, 0x51, 0x14, 0xb5, 0x70, 0x0e, 0x96, 0x33,
+      0xfe, 0x89, 0xc0, 0xde, 0x69, 0x2d, 0x44, 0x92,
+      0x24, 0x91, 0x8c, 0xe7, 0x26, 0x4f, 0x52, 0x4f,
+      0x81, 0x3d, 0xee, 0x5a, 0x3e, 0x47, 0x4c, 0xae,
+      0x50, 0x29, 0x15, 0xb7, 0x6d, 0xfb, 0xe1, 0xec,
+      0x79, 0xf4, 0x81, 0x0b, 0x70, 0x0f, 0x2c, 0x9a,
+      0xa6, 0x19, 0x8d, 0x31, 0x5d, 0x59, 0x96, 0x47,
+      0x31, 0x69, 0xad, 0xcf, 0xc6, 0x98, 0xce, 0x31,
+      0x0d, 0x80, 0x96, 0xe6, 0x48, 0x01, 0xe6, 0xbf,
+      0xac, 0x76, 0x01, 0x6a, 0x60, 0x2f, 0xcd, 0xe9,
+      0x6d, 0x23, 0x6e, 0xed, 0x9d, 0xae, 0x61, 0x00,
+      0x5e, 0xb1, 0x95, 0xf3, 0x26, 0x8f, 0x7f, 0x2e,
+      0xf9, 0x17, 0x50, 0x59, 0x74, 0x13, 0x34, 0x41,
+      0x04, 0x5a, 0x00, 0x00, 0x00, 0x20, 0x7a, 0x54,
+      0x58, 0x74, 0x74, 0x69, 0x66, 0x66, 0x3a, 0x72,
+      0x6f, 0x77, 0x73, 0x2d, 0x70, 0x65, 0x72, 0x2d,
+      0x73, 0x74, 0x72, 0x69, 0x70, 0x00, 0x00, 0x78,
+      0xda, 0x33, 0xb5, 0x30, 0x05, 0x00, 0x01, 0x47,
+      0x00, 0xa3, 0x38, 0xda, 0x77, 0x3b, 0x00, 0x00,
+      0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+      0x60, 0x82};
+
+    // currently we only support the close bitmap here
+    if ( button != wxTITLEBAR_BUTTON_CLOSE )
+    {
+        m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags);
+        return;
+    }
+
+    // choose the correct image depending on flags
+    const void *data;
+    size_t len;
+
+    if ( flags & wxCONTROL_PRESSED )
+    {
+        data = close_pressed_png;
+        len = WXSIZEOF(close_pressed_png);
+    }
+    else if ( flags & wxCONTROL_CURRENT )
+    {
+        data = close_current_png;
+        len = WXSIZEOF(close_current_png);
+    }
+    else
+    {
+        data = close_png;
+        len = WXSIZEOF(close_png);
+    }
+
+    // load it
+    wxMemoryInputStream mis(data, len);
+    wxImage image(mis, wxBITMAP_TYPE_PNG);
+    wxBitmap bmp(image);
+    wxASSERT_MSG( bmp.IsOk(), "failed to load embedded PNG image?" );
+
+    // and draw it centering it in the provided rectangle: we don't scale the
+    // image because this is really not going to look good for such a small
+    // (14*14) bitmap
+    dc.DrawBitmap(bmp, wxRect(bmp.GetSize()).CenterIn(rect).GetPosition());
+}
+
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP