Fix handling of help buttons with non-empty label under OS X.

[wxWidgets.git] / samples / dragimag / dragimag.cpp

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 31b3f4c2e09497191b8af30d76a2f7b5da12096f..cce62bcdfa16047aa339d8fd183a844a5c07cb82 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,9 +36,9 @@
 
 #include "dragimag.h"
 
 
 #include "dragimag.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-#include "mondrian.xpm"
-#include "dragicon.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+    #include "dragicon.xpm"

 #endif
 
 // main program
 #endif
 
 // main program


@@ -135,8 +135,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
         m_dragImage->Hide();
         m_dragImage->EndDrag();
 
         m_dragImage->Hide();
         m_dragImage->EndDrag();

-        delete m_dragImage;
-        m_dragImage = NULL;
+        wxDELETE(m_dragImage);

 
         m_draggedShape->SetShow(true);
 
 
         m_draggedShape->SetShow(true);
 


@@ -180,7 +179,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 }
                 case SHAPE_DRAG_TEXT:
                 {
                 }
                 case SHAPE_DRAG_TEXT:
                 {

-                    m_dragImage = new MyDragImage(this, wxString(_T("Dragging some test text")), wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new MyDragImage(this, wxString(wxT("Dragging some test text")), wxCursor(wxCURSOR_HAND));

                     break;
                 }
                 case SHAPE_DRAG_ICON:
                     break;
                 }
                 case SHAPE_DRAG_ICON:


@@ -203,8 +202,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
             if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
             {
 
             if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
             {

-                delete m_dragImage;
-                m_dragImage = (wxDragImage*) NULL;
+                wxDELETE(m_dragImage);

                 m_dragMode = TEST_DRAG_NONE;
 
             } else
                 m_dragMode = TEST_DRAG_NONE;
 
             } else


@@ -316,18 +314,18 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

-: wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxDragImage sample"),
+: wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxDragImage sample"),

           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();

-    file_menu->Append( wxID_ABOUT, _T("&About..."));
-    file_menu->AppendCheckItem( TEST_USE_SCREEN, _T("&Use whole screen for dragging"), _T("Use whole screen"));
-    file_menu->Append( wxID_EXIT, _T("E&xit"));
+    file_menu->Append( wxID_ABOUT, wxT("&About..."));
+    file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
+    file_menu->Append( wxID_EXIT, wxT("E&xit"));

 
     wxMenuBar *menu_bar = new wxMenuBar();
 
     wxMenuBar *menu_bar = new wxMenuBar();

-    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(file_menu, wxT("&File"));

 
 

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

     SetMenuBar( menu_bar );
 
 #if wxUSE_STATUSBAR
     SetMenuBar( menu_bar );
 
 #if wxUSE_STATUSBAR


@@ -346,9 +344,9 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {

-    (void)wxMessageBox( _T("wxDragImage demo\n")
-        _T("Julian Smart (c) 2000"),
-        _T("About wxDragImage Demo"),
+    (void)wxMessageBox( wxT("wxDragImage demo\n")
+        wxT("Julian Smart (c) 2000"),
+        wxT("About wxDragImage Demo"),

         wxICON_INFORMATION | wxOK );
 }
 
         wxICON_INFORMATION | wxOK );
 }
 


@@ -376,14 +374,14 @@ bool MyApp::OnInit()
 #endif
 
     wxImage image;
 #endif
 
     wxImage image;

-    if (image.LoadFile(_T("backgrnd.png"), wxBITMAP_TYPE_PNG))
+    if (image.LoadFile(wxT("backgrnd.png"), wxBITMAP_TYPE_PNG))

     {
         m_background = wxBitmap(image);
     }
 
     MyFrame *frame = new MyFrame();
 
     {
         m_background = wxBitmap(image);
     }
 
     MyFrame *frame = new MyFrame();
 

-    wxString rootName(_T("shape0"));
+    wxString rootName(wxT("shape0"));

 
     for (int i = 1; i < 4; i++)
     {
 
     for (int i = 1; i < 4; i++)
     {