X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60f8c22b2502f825e054cb4cacd7c119a5aca8dd..1d91908363c58e2c1ad38c550e6def0cca5a2e86:/samples/artprov/artbrows.cpp

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index f4b8eb666f..b4a6f622c1 100644
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -6,7 +6,7 @@
 // Created:     2002/04/05
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -29,7 +29,7 @@
 #include "artbrows.h"
 
 #define ART_CLIENT(id) \
-    choice->Append(_T(#id), (void*)id);
+    choice->Append(wxT(#id), (void*)id);
 #define ART_ICON(id) \
     { \
         int ind; \
@@ -38,8 +38,8 @@
             ind = images->Add(icon); \
         else \
             ind = 0; \
-        list->InsertItem(index, _T(#id), ind); \
-        list->SetItemData(index, (long)id); \
+        list->InsertItem(index, wxT(#id), ind); \
+        list->SetItemPtrData(index, wxPtrToUInt(id)); \
         index++; \
     }
 
@@ -125,7 +125,7 @@ BEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)
 END_EVENT_TABLE()
 
 wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
-    : wxDialog(parent, wxID_ANY, _T("Art resources browser"),
+    : wxDialog(parent, wxID_ANY, wxT("Art resources browser"),
                wxDefaultPosition, wxDefaultSize,
                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
@@ -136,7 +136,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
     FillClients(choice);
 
     subsizer = new wxBoxSizer(wxHORIZONTAL);
-    subsizer->Add(new wxStaticText(this, wxID_ANY, _T("Client:")), 0, wxALIGN_CENTER_VERTICAL);
+    subsizer->Add(new wxStaticText(this, wxID_ANY, wxT("Client:")), 0, wxALIGN_CENTER_VERTICAL);
     subsizer->Add(choice, 1, wxLEFT, 5);
     sizer->Add(subsizer, 0, wxALL | wxEXPAND, 10);
 
@@ -144,7 +144,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 
     m_list = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(250, 300),
                             wxLC_REPORT | wxSUNKEN_BORDER);
-    m_list->InsertColumn(0, _T("wxArtID"));
+    m_list->InsertColumn(0, wxT("wxArtID"));
     subsizer->Add(m_list, 1, wxEXPAND | wxRIGHT, 10);
 
     wxSizer *subsub = new wxBoxSizer(wxVERTICAL);
@@ -158,12 +158,11 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 
     sizer->Add(subsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 10);
 
-    wxButton *ok = new wxButton(this, wxID_OK, _T("Close"));
+    wxButton *ok = new wxButton(this, wxID_OK, wxT("Close"));
     ok->SetDefault();
     sizer->Add(ok, 0, wxALIGN_RIGHT | wxALL, 10);
 
-    SetSizer(sizer);
-    sizer->Fit(this);
+    SetSizerAndFit(sizer);
 
     choice->SetSelection(6/*wxART_MESSAGE_BOX*/);
     SetArtClient(wxART_MESSAGE_BOX);