Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / artprov / artbrows.cpp

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index cbc1802c6a6a90fb10900a6784f24bea7c71bc46..8f36347e5022ae48a0c6f23e7eaa3423fedfb15d 100644 (file)
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -6,13 +6,9 @@
 // Created:     2002/04/05
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
 // Created:     2002/04/05
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "artbrows.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -22,27 +18,28 @@
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"

-    #include "wx/listctrl.h"

     #include "wx/choice.h"
 #endif
 
     #include "wx/choice.h"
 #endif
 

+#include "wx/listctrl.h"

 #include "wx/sizer.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"
 #include "wx/imaglist.h"

+#include "wx/listctrl.h"

 
 #include "artbrows.h"
 
 #define ART_CLIENT(id) \
 
 #include "artbrows.h"
 
 #define ART_CLIENT(id) \

-    choice->Append(#id, (void*)id);
+    choice->Append(wxT(#id), (void*)id);

 #define ART_ICON(id) \
     { \
         int ind; \
         wxIcon icon = wxArtProvider::GetIcon(id, client, size); \
 #define ART_ICON(id) \
     { \
         int ind; \
         wxIcon icon = wxArtProvider::GetIcon(id, client, size); \

-        if ( icon.Ok() ) \
+        if ( icon.IsOk() ) \

             ind = images->Add(icon); \
         else \
             ind = 0; \
             ind = images->Add(icon); \
         else \
             ind = 0; \

-        list->InsertItem(index, #id, ind); \
-        list->SetItemData(index, (long)id); \
+        list->InsertItem(index, wxT(#id), ind); \
+        list->SetItemPtrData(index, wxPtrToUInt(id)); \

         index++; \
     }
 
         index++; \
     }
 


@@ -53,12 +50,13 @@
 static void FillClients(wxChoice *choice)
 {
     ART_CLIENT(wxART_OTHER)
 static void FillClients(wxChoice *choice)
 {
     ART_CLIENT(wxART_OTHER)

+    ART_CLIENT(wxART_BUTTON)

     ART_CLIENT(wxART_TOOLBAR)
     ART_CLIENT(wxART_MENU)
     ART_CLIENT(wxART_FRAME_ICON)
     ART_CLIENT(wxART_CMN_DIALOG)
     ART_CLIENT(wxART_HELP_BROWSER)
     ART_CLIENT(wxART_TOOLBAR)
     ART_CLIENT(wxART_MENU)
     ART_CLIENT(wxART_FRAME_ICON)
     ART_CLIENT(wxART_CMN_DIALOG)
     ART_CLIENT(wxART_HELP_BROWSER)

-    ART_CLIENT(wxART_MESSAGE_BOX)
+    ART_CLIENT(wxART_MESSAGE_BOX) // Keep this last, it's the initial shown one

 }
 
 static void FillBitmaps(wxImageList *images, wxListCtrl *list,
 }
 
 static void FillBitmaps(wxImageList *images, wxListCtrl *list,


@@ -82,7 +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_GO_DOWN)
     ART_ICON(wxART_GO_TO_PARENT)
     ART_ICON(wxART_GO_HOME)

-    ART_ICON(wxART_FILE_OPEN)
+    ART_ICON(wxART_GOTO_FIRST)
+    ART_ICON(wxART_GOTO_LAST)

     ART_ICON(wxART_PRINT)
     ART_ICON(wxART_HELP)
     ART_ICON(wxART_TIP)
     ART_ICON(wxART_PRINT)
     ART_ICON(wxART_HELP)
     ART_ICON(wxART_TIP)


@@ -90,11 +89,32 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
     ART_ICON(wxART_LIST_VIEW)
     ART_ICON(wxART_NEW_DIR)
     ART_ICON(wxART_FOLDER)
     ART_ICON(wxART_LIST_VIEW)
     ART_ICON(wxART_NEW_DIR)
     ART_ICON(wxART_FOLDER)

+    ART_ICON(wxART_FOLDER_OPEN);

     ART_ICON(wxART_GO_DIR_UP)
     ART_ICON(wxART_EXECUTABLE_FILE)
     ART_ICON(wxART_NORMAL_FILE)
     ART_ICON(wxART_TICK_MARK)
     ART_ICON(wxART_CROSS_MARK)
     ART_ICON(wxART_GO_DIR_UP)
     ART_ICON(wxART_EXECUTABLE_FILE)
     ART_ICON(wxART_NORMAL_FILE)
     ART_ICON(wxART_TICK_MARK)
     ART_ICON(wxART_CROSS_MARK)

+    ART_ICON(wxART_MISSING_IMAGE)
+    ART_ICON(wxART_NEW);
+    ART_ICON(wxART_FILE_OPEN)
+    ART_ICON(wxART_FILE_SAVE)
+    ART_ICON(wxART_FILE_SAVE_AS)
+    ART_ICON(wxART_DELETE);
+    ART_ICON(wxART_COPY)
+    ART_ICON(wxART_CUT)
+    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)
+    ART_ICON(wxART_HARDDISK)
+    ART_ICON(wxART_FLOPPY)
+    ART_ICON(wxART_CDROM)
+    ART_ICON(wxART_REMOVABLE)

 }
 
 
 }
 
 


@@ -105,50 +125,51 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
 #include "null.xpm"
 
 BEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)
 #include "null.xpm"
 
 BEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)

-    EVT_LIST_ITEM_SELECTED(-1, wxArtBrowserDialog::OnSelectItem)
-    EVT_CHOICE(-1, wxArtBrowserDialog::OnChooseClient)
+    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem)
+    EVT_CHOICE(wxID_ANY, wxArtBrowserDialog::OnChooseClient)

 END_EVENT_TABLE()
 
 wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 END_EVENT_TABLE()
 
 wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)

-    : wxDialog(parent, -1, _T("Art resources browser"), 
-               wxDefaultPosition, wxDefaultSize, 
+    : wxDialog(parent, wxID_ANY, wxT("Art resources browser"),
+               wxDefaultPosition, wxDefaultSize,

                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     wxSizer *subsizer;
                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     wxSizer *subsizer;

-    
-    wxChoice *choice = new wxChoice(this, -1);
+
+    wxChoice *choice = new wxChoice(this, wxID_ANY);

     FillClients(choice);
     FillClients(choice);

-    
+

     subsizer = new wxBoxSizer(wxHORIZONTAL);
     subsizer = new wxBoxSizer(wxHORIZONTAL);

-    subsizer->Add(new wxStaticText(this, -1, _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);
 
     subsizer = new wxBoxSizer(wxHORIZONTAL);
     subsizer->Add(choice, 1, wxLEFT, 5);
     sizer->Add(subsizer, 0, wxALL | wxEXPAND, 10);
 
     subsizer = new wxBoxSizer(wxHORIZONTAL);

-    
-    m_list = new wxListCtrl(this, -1, wxDefaultPosition, wxSize(250, 300),
+
+    m_list = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(250, 300),

                             wxLC_REPORT | wxSUNKEN_BORDER);
                             wxLC_REPORT | wxSUNKEN_BORDER);

-    m_list->InsertColumn(0, _T("wxArtID"));
+    m_list->AppendColumn(wxT("wxArtID"));

     subsizer->Add(m_list, 1, wxEXPAND | wxRIGHT, 10);
     subsizer->Add(m_list, 1, wxEXPAND | wxRIGHT, 10);

-    
+

     wxSizer *subsub = new wxBoxSizer(wxVERTICAL);
     wxSizer *subsub = new wxBoxSizer(wxVERTICAL);

-    m_canvas = new wxStaticBitmap(this, -1, wxBitmap(null_xpm));
+    m_text = new wxStaticText(this, wxID_ANY, wxT("Size: 333x333"));
+    subsub->Add(m_text);
+
+    m_canvas = new wxStaticBitmap(this, wxID_ANY, wxBitmap(null_xpm));

     subsub->Add(m_canvas);
     subsub->Add(100, 100);
     subsizer->Add(subsub);
 
     sizer->Add(subsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 10);
     subsub->Add(m_canvas);
     subsub->Add(100, 100);
     subsizer->Add(subsub);
 
     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);
     ok->SetDefault();
     sizer->Add(ok, 0, wxALIGN_RIGHT | wxALL, 10);

-    
-    SetSizer(sizer);
-    SetAutoLayout(TRUE);
-    sizer->Fit(this);

 
 

-    choice->SetSelection(6/*wxART_MESSAGE_BOX*/);
+    SetSizerAndFit(sizer);
+
+    choice->SetSelection(choice->GetCount() - 1);

     SetArtClient(wxART_MESSAGE_BOX);
 }
 
     SetArtClient(wxART_MESSAGE_BOX);
 }
 


@@ -156,29 +177,42 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 {
     wxBusyCursor bcur;
 void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 {
     wxBusyCursor bcur;

-    
+

     wxImageList *img = new wxImageList(16, 16);
     img->Add(wxIcon(null_xpm));
     int index = 0;
 
     wxImageList *img = new wxImageList(16, 16);
     img->Add(wxIcon(null_xpm));
     int index = 0;
 

+    long sel = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
+    if (sel < 0) sel = 0;
+

     m_list->DeleteAllItems();
     FillBitmaps(img, m_list, index, client, wxSize(16, 16));
     m_list->AssignImageList(img, wxIMAGE_LIST_SMALL);
     m_list->SetColumnWidth(0, wxLIST_AUTOSIZE);
 
     m_list->DeleteAllItems();
     FillBitmaps(img, m_list, index, client, wxSize(16, 16));
     m_list->AssignImageList(img, wxIMAGE_LIST_SMALL);
     m_list->SetColumnWidth(0, wxLIST_AUTOSIZE);
 

+    m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+

     m_client = client;
     m_client = client;

+    SetArtBitmap((const char*)m_list->GetItemData(sel), m_client);

 }
 
 void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
 {
 }
 
 void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
 {

-    const wxChar *data = (const wxChar*)event.GetData();
-    wxBitmap bmp = wxArtProvider::GetBitmap(data, m_client);
-    m_canvas->SetBitmap(bmp);
-    m_canvas->SetSize(bmp.GetWidth(), bmp.GetHeight());
+    const char *data = (const char*)event.GetData();
+    SetArtBitmap(data, m_client, wxDefaultSize);

 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
 {
 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
 {

-    const wxChar *data = (const wxChar*)event.GetClientData();
+    const char *data = (const char*)event.GetClientData();

     SetArtClient(data);
 }
     SetArtClient(data);
 }

+
+void wxArtBrowserDialog::SetArtBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
+{
+    wxBitmap bmp = wxArtProvider::GetBitmap(id, client, size);
+    m_canvas->SetSize(bmp.GetWidth(), bmp.GetHeight());
+    m_canvas->SetBitmap(bmp);
+    m_text->SetLabel(wxString::Format(wxT("Size: %d x %d"), bmp.GetWidth(), bmp.GetHeight()));
+    Refresh();
+}