fixes potential crash under gatekeeper

[wxWidgets.git] / samples / render / renddll.cpp

diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp
index 61f1ffbb8ecbc6142cf8bcb11e0d8d0ea488a62f..3789822551ff1d1c1f56dd2994f9448703d3140e 100644 (file)
--- a/samples/render/renddll.cpp
+++ b/samples/render/renddll.cpp
@@ -27,15 +27,19 @@ class MyDllRenderer : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
 {
 public:
     // draw the header control button (used by wxListCtrl)

-    virtual void DrawHeaderButton(wxWindow * WXUNUSED(win),
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int WXUNUSED(flags) = 0)
+    virtual int DrawHeaderButton(wxWindow * WXUNUSED(win),
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int WXUNUSED(flags) = 0,
+                                 wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE,
+                                 wxHeaderButtonParams* WXUNUSED(params) = NULL)

     {
         dc.SetBrush(*wxCYAN_BRUSH);
         dc.SetTextForeground(*wxRED);
         dc.DrawRoundedRectangle(rect, 10);
     {
         dc.SetBrush(*wxCYAN_BRUSH);
         dc.SetTextForeground(*wxRED);
         dc.DrawRoundedRectangle(rect, 10);

-        dc.DrawLabel(_T("MyDllRenderer"), wxNullBitmap, rect, wxALIGN_CENTER);
+        dc.DrawLabel("MyDllRenderer", wxNullBitmap, rect, wxALIGN_CENTER);
+
+        return dc.GetTextExtent("MyDllRenderer").x;

     }
 
     virtual wxRendererVersion GetVersion() const
     }
 
     virtual wxRendererVersion GetVersion() const


@@ -47,12 +51,12 @@ public:
 #if 0 // just for debugging
     MyDllRenderer()
     {
 #if 0 // just for debugging
     MyDllRenderer()
     {

-        wxMessageBox(_T("Creating MyDllRenderer"), _T("Renderer Sample"));
+        wxMessageBox(wxT("Creating MyDllRenderer"), wxT("Renderer Sample"));

     }
 
     virtual ~MyDllRenderer()
     {
     }
 
     virtual ~MyDllRenderer()
     {

-        wxMessageBox(_T("Deleting MyDllRenderer"), _T("Renderer Sample"));
+        wxMessageBox(wxT("Deleting MyDllRenderer"), wxT("Renderer Sample"));

     }
 #endif // 0
 };
     }
 #endif // 0
 };