X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b8983996ebda21750310495de29cc9d0c4b4efc..e0dec8753abaf97e006ea1185bfb6775b28df0a8:/samples/artprov/artbrows.cpp diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp index 697aa57168..e58377e3da 100644 --- a/samples/artprov/artbrows.cpp +++ b/samples/artprov/artbrows.cpp @@ -34,7 +34,7 @@ { \ int ind; \ wxIcon icon = wxArtProvider::GetIcon(id, client, size); \ - if ( icon.Ok() ) \ + if ( icon.IsOk() ) \ ind = images->Add(icon); \ else \ ind = 0; \ @@ -80,6 +80,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list, ART_ICON(wxART_GO_DOWN) ART_ICON(wxART_GO_TO_PARENT) ART_ICON(wxART_GO_HOME) + ART_ICON(wxART_GOTO_FIRST) + ART_ICON(wxART_GOTO_LAST) ART_ICON(wxART_PRINT) ART_ICON(wxART_HELP) ART_ICON(wxART_TIP) @@ -104,6 +106,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list, ART_ICON(wxART_PASTE) ART_ICON(wxART_UNDO) ART_ICON(wxART_REDO) + ART_ICON(wxART_PLUS) + ART_ICON(wxART_MINUS) ART_ICON(wxART_QUIT) ART_ICON(wxART_FIND) ART_ICON(wxART_FIND_AND_REPLACE) @@ -189,18 +193,18 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client) m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); m_client = client; - SetArtBitmap((const wxChar*)m_list->GetItemData(sel), m_client); + SetArtBitmap((const char*)m_list->GetItemData(sel), m_client); } void wxArtBrowserDialog::OnSelectItem(wxListEvent &event) { - const wxChar *data = (const wxChar*)event.GetData(); + const char *data = (const char*)event.GetData(); SetArtBitmap(data, m_client, wxDefaultSize); } void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event) { - const wxChar *data = (const wxChar*)event.GetClientData(); + const char *data = (const char*)event.GetClientData(); SetArtClient(data); }