Merge in from trunk r67662 to r64801

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 16:54:53 +00:00
parent 0995b9dc18 f0e5d5d22c
commit 906c935a80
727 changed files with 42813 additions and 46104 deletions
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,22 +15,22 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.9.2, (c) 2005-2010 wxWidgets</string>
+	<string>2.9.3, (c) 2005-2011 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.2</string>
+	<string>2.9.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.2</string>
+	<string>2.9.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2010 wxWidgets</string>
+	<string>Copyright 2005-2011 wxWidgets</string>
 </dict>
 </plist>
--- a/samples/access/accesstestW7.xml
+++ b/samples/access/accesstestW7.xml
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -293,7 +293,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
        m_animationCtrl->Play();
    #else
        wxFileInputStream stream(filename);
-        if (!stream.Ok())
+        if (!stream.IsOk())
        {
            wxLogError(wxT("Sorry, this animation is not a valid format for wxAnimation."));
            return;
--- 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; \
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -798,7 +798,7 @@ MyFrame::MyFrame(wxWindow* parent,
    tb2->SetToolBitmapSize(wxSize(16,16));

    wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16));
-    tb2->AddTool(ID_SampleItem+6, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+6, wxT("Disabled"), tb2_bmp1);
    tb2->AddTool(ID_SampleItem+7, wxT("Test"), tb2_bmp1);
    tb2->AddTool(ID_SampleItem+8, wxT("Test"), tb2_bmp1);
    tb2->AddTool(ID_SampleItem+9, wxT("Test"), tb2_bmp1);
@@ -811,6 +811,7 @@ MyFrame::MyFrame(wxWindow* parent,
    tb2->AddTool(ID_SampleItem+14, wxT("Test"), tb2_bmp1);
    tb2->AddTool(ID_SampleItem+15, wxT("Test"), tb2_bmp1);
    tb2->SetCustomOverflowItems(prepend_items, append_items);
+    tb2->EnableTool(ID_SampleItem+6, false);
    tb2->Realize();


--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -280,7 +280,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #ifdef __WXGTK20__
    EVT_UPDATE_UI(Calendar_Cal_Monday, MyFrame::OnUpdateUIGenericOnly)
    EVT_UPDATE_UI(Calendar_Cal_Holidays, MyFrame::OnUpdateUIGenericOnly)
-    EVT_UPDATE_UI(Calendar_Cal_LimitDates, MyFrame::OnUpdateUIGenericOnly)
 #endif
    EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly)
    EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -103,6 +103,14 @@ int main(int argc, char **argv)
            break;
    }

+    if ( argc == 1 )
+    {
+        // If there were no command-line options supplied, emit a message
+        // otherwise it's not obvious that the sample ran successfully
+        wxPrintf("Welcome to the wxWidgets 'console' sample!\n");
+        wxPrintf("For more information, run it again with the --help option\n");
+    }
+
    // do something useful here

    return 0;
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -721,7 +721,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
    for ( size_t n = 0; n < Image_Max; n++ )
    {
        wxBitmap bmp(s_iconNames[n]);
-        if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
+        if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) )
        {
            wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),
                    s_iconNames[n], n);
@@ -957,7 +957,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #if defined(__WXMSW__) || defined(__WXMOTIF__)
    // test for masked bitmap display
    bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP);
-    if (bitmap.Ok())
+    if (bitmap.IsOk())
    {
       bitmap.SetMask(new wxMask(bitmap, *wxBLUE));

@@ -1183,7 +1183,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))

    SetThemeEnabled(false);
    // test panel colour changing and propagation to the subcontrols
-    if ( s_colOld.Ok() )
+    if ( s_colOld.IsOk() )
    {
        SetBackgroundColour(s_colOld);
        s_colOld = wxNullColour;
--- a/samples/controls/controlsW7.xml
+++ b/samples/controls/controlsW7.xml
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -540,10 +540,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
            m_music_model = new MyMusicTreeModel;
            m_ctrl[0]->AssociateModel( m_music_model.get() );

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP && wxUSE_UNICODE
            m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT );
            m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT );
-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP && wxUSE_UNICODE

            // column 0 of the view control:

@@ -1160,8 +1160,11 @@ void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event))
 {
    wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3];
    wxDataViewItem selected = ctrl->GetSelection();
-    if (ctrl->IsContainer(selected))
-        ctrl->AppendItem( selected, "Item", 0 );
+    if (ctrl->IsContainer(selected)) {
+        wxDataViewItem newitem = ctrl->AppendItem( selected, "Item", 0 );
+        ctrl->Select(newitem);
+        ctrl->StartEditor(newitem, 0);
+    }
 }

 void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event))
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -1769,10 +1769,15 @@ void MyFrame::OnStandardButtonsSizerDialog(wxCommandEvent& WXUNUSED(event))

 #define ID_CATCH_LISTBOX_DCLICK 100
 #define ID_LISTBOX              101
+#define ID_DISABLE_OK           102
+#define ID_DISABLE_CANCEL       103

 BEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog)
    EVT_CHECKBOX(ID_CATCH_LISTBOX_DCLICK,    TestDefaultActionDialog::OnCatchListBoxDClick)
+    EVT_CHECKBOX(ID_DISABLE_OK,              TestDefaultActionDialog::OnDisableOK)
+    EVT_CHECKBOX(ID_DISABLE_CANCEL,          TestDefaultActionDialog::OnDisableCancel)
    EVT_LISTBOX_DCLICK(ID_LISTBOX,           TestDefaultActionDialog::OnListBoxDClick)
+    EVT_TEXT_ENTER(wxID_ANY,                 TestDefaultActionDialog::OnTextEnter)
 END_EVENT_TABLE()

 TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
@@ -1801,6 +1806,9 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
    grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER ), 0, wxALIGN_CENTRE_VERTICAL );
    grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl with wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL );

+    grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_OK, "Disable \"OK\""), 0, wxALIGN_CENTRE_VERTICAL );
+    grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_CANCEL, "Disable \"Cancel\""), 0, wxALIGN_CENTRE_VERTICAL );
+
    main_sizer->Add( grid_sizer, 0, wxALL, 10 );

    wxSizer *button_sizer = CreateSeparatedButtonSizer( wxOK|wxCANCEL );
@@ -1810,6 +1818,16 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) :
    SetSizerAndFit( main_sizer );
 }

+void TestDefaultActionDialog::OnDisableOK(wxCommandEvent& event)
+{
+    FindWindow(wxID_OK)->Enable(!event.IsChecked());
+}
+
+void TestDefaultActionDialog::OnDisableCancel(wxCommandEvent& event)
+{
+    FindWindow(wxID_CANCEL)->Enable(!event.IsChecked());
+}
+
 void TestDefaultActionDialog::OnListBoxDClick(wxCommandEvent& event)
 {
    event.Skip( !m_catchListBoxDClick );
@@ -1820,6 +1838,11 @@ void TestDefaultActionDialog::OnCatchListBoxDClick(wxCommandEvent& WXUNUSED(even
    m_catchListBoxDClick = !m_catchListBoxDClick;
 }

+void TestDefaultActionDialog::OnTextEnter(wxCommandEvent& event)
+{
+    wxLogMessage("Text \"%s\" entered.", event.GetString());
+}
+
 void MyFrame::OnTestDefaultActionDialog(wxCommandEvent& WXUNUSED(event))
 {
    TestDefaultActionDialog dialog( this );
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -293,7 +293,10 @@ public:
    TestDefaultActionDialog( wxWindow *parent );

    void OnListBoxDClick(wxCommandEvent& event);
+    void OnDisableOK(wxCommandEvent& event);
+    void OnDisableCancel(wxCommandEvent& event);
    void OnCatchListBoxDClick(wxCommandEvent& event);
+    void OnTextEnter(wxCommandEvent& event);

 private:
    bool   m_catchListBoxDClick;
--- a/samples/dialogs/dialogsW7.xml
+++ b/samples/dialogs/dialogsW7.xml
--- a/samples/dll/my_dll.cpp
+++ b/samples/dll/my_dll.cpp
@@ -150,10 +150,10 @@ MyDllApp::MyDllApp()

    Connect(wxEVT_IDLE, wxIdleEventHandler(MyDllApp::OnIdle));
    Connect(CMD_SHOW_WINDOW,
-            wxEVT_COMMAND_THREAD,
+            wxEVT_THREAD,
            wxThreadEventHandler(MyDllApp::OnShowWindow));
    Connect(CMD_TERMINATE,
-            wxEVT_COMMAND_THREAD,
+            wxEVT_THREAD,
            wxThreadEventHandler(MyDllApp::OnTerminate));
 }

@@ -288,7 +288,7 @@ void run_wx_gui_from_dll(const char *title)

    // Send a message to wx thread to show a new frame:
    wxThreadEvent *event =
-        new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_SHOW_WINDOW);
+        new wxThreadEvent(wxEVT_THREAD, CMD_SHOW_WINDOW);
    event->SetString(title);
    wxQueueEvent(wxApp::GetInstance(), event);
 }
@@ -303,7 +303,7 @@ void wx_dll_cleanup()
    // If wx main thread is running, we need to stop it. To accomplish this,
    // send a message telling it to terminate the app.
    wxThreadEvent *event =
-        new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_TERMINATE);
+        new wxThreadEvent(wxEVT_THREAD, CMD_TERMINATE);
    wxQueueEvent(wxApp::GetInstance(), event);

    // We must then wait for the thread to actually terminate.
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -141,7 +141,7 @@ public:
    {
        wxPaintDC dc(this);

-        if ( m_bitmap.Ok() )
+        if ( m_bitmap.IsOk() )
        {
            PrepareDC(dc);

@@ -177,7 +177,7 @@ public:
    {
        wxPaintDC dc(this);

-        if ( m_metafile.Ok() )
+        if ( m_metafile.IsOk() )
        {
            PrepareDC(dc);

@@ -1327,7 +1327,7 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
                    wxBITMAP_TYPE_BMP
 #endif
                  );
-    if (!image.Ok())
+    if (!image.IsOk())
    {
        wxLogError( wxT("Invalid image file...") );
        return;
--- a/samples/dnd/dndW7.xml
+++ b/samples/dnd/dndW7.xml
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>doc</string>
 	<key>CFBundleIdentifier</key>
@@ -66,22 +66,22 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>2.9.2, (c) 2005-2010 wxWidgets</string>
+	<string>2.9.3, (c) 2005-2011 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.2</string>
+	<string>2.9.3</string>
 	<key>CFBundleSignature</key>
 	<string>WXMA</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.2</string>
+	<string>2.9.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2010 wxWidgets</string>
+	<string>Copyright 2005-2011 wxWidgets</string>
 </dict>
 </plist>
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -79,6 +79,16 @@ DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream)

    wxInt32 count = 0;
    stream >> count;
+    if ( count < 0 )
+    {
+        wxLogWarning("Drawing document corrupted: invalid segments count.");
+#if wxUSE_STD_IOSTREAM
+        istream.clear(std::ios::badbit);
+#else
+        istream.Reset(wxSTREAM_READ_ERROR);
+#endif
+        return istream;
+    }

    for ( int n = 0; n < count; n++ )
    {
@@ -250,7 +260,7 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
 }

 // ----------------------------------------------------------------------------
-// ImageDocument and wxImageDetailsDocument implementation
+// ImageDocument and ImageDetailsDocument implementation
 // ----------------------------------------------------------------------------

 IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
@@ -260,3 +270,29 @@ bool ImageDocument::DoOpenDocument(const wxString& file)
    return m_image.LoadFile(file);
 }

+bool ImageDocument::OnOpenDocument(const wxString& filename)
+{
+    if ( !wxDocument::OnOpenDocument(filename) )
+        return false;
+
+    // we don't have a wxDocTemplate for the image details document as it's
+    // never created by wxWidgets automatically, instead just do it manually
+    ImageDetailsDocument * const docDetails = new ImageDetailsDocument(this);
+    docDetails->SetFilename(filename);
+
+    new ImageDetailsView(docDetails);
+
+    return true;
+}
+
+ImageDetailsDocument::ImageDetailsDocument(ImageDocument *parent)
+    : wxDocument(parent)
+{
+    const wxImage image = parent->GetImage();
+
+    m_size.x = image.GetWidth();
+    m_size.y = image.GetHeight();
+    m_numColours = image.CountColours();
+    m_type = image.GetType();
+    m_hasAlpha = image.HasAlpha();
+}
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -198,14 +198,19 @@ public:
 };

 // ----------------------------------------------------------------------------
-// A document class representing an image
+// Image and image details document classes (both are read-only for simplicity)
 // ----------------------------------------------------------------------------

+// This is a normal document containing an image, just like TextEditDocument
+// above contains some text. It can be created from an image file on disk as
+// usual.
 class ImageDocument : public wxDocument
 {
 public:
    ImageDocument() : wxDocument() { }

+    virtual bool OnOpenDocument(const wxString& file);
+
    wxImage GetImage() const { return m_image; }

 protected:
@@ -218,4 +223,28 @@ private:
    DECLARE_DYNAMIC_CLASS(ImageDocument)
 };

+// This is a child document of ImageDocument: this document doesn't
+// correspond to any file on disk, it's part of ImageDocument and can't be
+// instantiated independently of it.
+class ImageDetailsDocument : public wxDocument
+{
+public:
+    ImageDetailsDocument(ImageDocument *parent);
+
+    // accessors for ImageDetailsView
+    wxSize GetSize() const { return m_size; }
+    unsigned long GetNumColours() const { return m_numColours; }
+    wxBitmapType GetType() const { return m_type; }
+    bool HasAlpha() const { return m_hasAlpha; }
+
+private:
+    // some information about the image we choose to show to the user
+    wxSize m_size;
+    unsigned long m_numColours;
+    wxBitmapType m_type;
+    bool m_hasAlpha;
+
+    wxDECLARE_NO_COPY_CLASS(ImageDetailsDocument);
+};
+
 #endif // _WX_SAMPLES_DOCVIEW_DOC_H_
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -55,6 +55,7 @@
 #include "view.h"

 #include "wx/cmdline.h"
+#include "wx/config.h"

 #ifdef __WXMAC__
    #include "wx/filename.h"
@@ -150,7 +151,10 @@ bool MyApp::OnInit()

    ::wxInitAllImageHandlers();

-    SetAppName("DocView Sample");
+    // Fill in the application information fields before creating wxConfig.
+    SetVendorName("wxWidgets");
+    SetAppName("wx_docview_sample");
+    SetAppDisplayName("wxWidgets DocView Sample");

    //// Create a document manager
    wxDocManager *docManager = new wxDocManager;
@@ -217,6 +221,10 @@ bool MyApp::OnInit()

    // A nice touch: a history of files visited. Use this menu.
    docManager->FileHistoryUseMenu(menuFile);
+#if wxUSE_CONFIG
+    docManager->FileHistoryLoad(*wxConfig::Get());
+#endif // wxUSE_CONFIG
+

    if ( m_mode == Mode_Single )
    {
@@ -236,7 +244,11 @@ bool MyApp::OnInit()

 int MyApp::OnExit()
 {
-    delete wxDocManager::GetDocumentManager();
+    wxDocManager * const manager = wxDocManager::GetDocumentManager();
+#if wxUSE_CONFIG
+    manager->FileHistorySave(*wxConfig::Get());
+#endif // wxUSE_CONFIG
+    delete manager;

    return wxApp::OnExit();
 }
--- a/samples/docview/docviewW7.xml
+++ b/samples/docview/docviewW7.xml
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -53,6 +53,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long flags)
        wxFrame* frame = app.CreateChildFrame(this, true);
        wxASSERT(frame == GetFrame());
        m_canvas = new MyCanvas(this);
+        frame->Show();
    }
    else // single document mode
    {
@@ -64,7 +65,6 @@ bool DrawingView::OnCreate(wxDocument *doc, long flags)
        doc->GetCommandProcessor()->SetEditMenu(app.GetMainWindowEditMenu());
        doc->GetCommandProcessor()->Initialize();
    }
-    GetFrame()->Show();

    return true;
 }
@@ -362,3 +362,76 @@ bool ImageView::OnClose(bool deleteWindow)
    return true;
 }

+// ----------------------------------------------------------------------------
+// ImageDetailsView
+// ----------------------------------------------------------------------------
+
+ImageDetailsView::ImageDetailsView(ImageDetailsDocument *doc)
+                : wxView()
+{
+    SetDocument(doc);
+
+    m_frame = wxGetApp().CreateChildFrame(this, false);
+    m_frame->SetTitle("Image Details");
+
+    wxPanel * const panel = new wxPanel(m_frame);
+    wxFlexGridSizer * const sizer = new wxFlexGridSizer(2, wxSize(5, 5));
+    const wxSizerFlags
+        flags = wxSizerFlags().Align(wxALIGN_CENTRE_VERTICAL).Border();
+
+    sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &file:"), flags);
+    sizer->Add(new wxStaticText(panel, wxID_ANY, doc->GetFilename()), flags);
+
+    sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &type:"), flags);
+    wxString typeStr;
+    switch ( doc->GetType() )
+    {
+        case wxBITMAP_TYPE_PNG:
+            typeStr = "PNG";
+            break;
+
+        case wxBITMAP_TYPE_JPEG:
+            typeStr = "JPEG";
+            break;
+
+        default:
+            typeStr = "Unknown";
+    }
+    sizer->Add(new wxStaticText(panel, wxID_ANY, typeStr), flags);
+
+    sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &size:"), flags);
+    wxSize size = doc->GetSize();
+    sizer->Add(new wxStaticText(panel, wxID_ANY,
+                                wxString::Format("%d*%d", size.x, size.y)),
+               flags);
+
+    sizer->Add(new wxStaticText(panel, wxID_ANY, "Number of unique &colours:"),
+               flags);
+    sizer->Add(new wxStaticText(panel, wxID_ANY,
+                                wxString::Format("%lu", doc->GetNumColours())),
+               flags);
+
+    sizer->Add(new wxStaticText(panel, wxID_ANY, "Uses &alpha:"), flags);
+    sizer->Add(new wxStaticText(panel, wxID_ANY,
+                                doc->HasAlpha() ? "Yes" : "No"), flags);
+
+    panel->SetSizer(sizer);
+    m_frame->SetClientSize(panel->GetBestSize());
+    m_frame->Show(true);
+}
+
+void ImageDetailsView::OnDraw(wxDC * WXUNUSED(dc))
+{
+    // nothing to do here, we use controls to show our information
+}
+
+bool ImageDetailsView::OnClose(bool deleteWindow)
+{
+    if ( wxGetApp().GetMode() != MyApp::Mode_Single && deleteWindow )
+    {
+        delete m_frame;
+        m_frame = NULL;
+    }
+
+    return true;
+}
--- a/samples/docview/view.h
+++ b/samples/docview/view.h
@@ -148,4 +148,22 @@ private:
    DECLARE_DYNAMIC_CLASS(ImageView)
 };

+// ----------------------------------------------------------------------------
+// ImageDetailsView
+// ----------------------------------------------------------------------------
+
+class ImageDetailsView : public wxView
+{
+public:
+    ImageDetailsView(ImageDetailsDocument *doc);
+
+    virtual void OnDraw(wxDC *dc);
+    virtual bool OnClose(bool deleteWindow);
+
+private:
+    wxFrame *m_frame;
+
+    wxDECLARE_NO_COPY_CLASS(ImageDetailsView);
+};
+
 #endif // _WX_SAMPLES_DOCVIEW_VIEW_H_
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -87,7 +87,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )

 void MyCanvas::OnEraseBackground(wxEraseEvent& event)
 {
-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())
    {
        wxSize sz = GetClientSize();
        wxRect rect(0, 0, sz.x, sz.y);
@@ -468,7 +468,7 @@ bool DragShape::HitTest(const wxPoint& pt) const

 bool DragShape::Draw(wxDC& dc, bool highlight)
 {
-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())
    {
        wxMemoryDC memDC;
        memDC.SelectObject(m_bitmap);
@@ -498,7 +498,7 @@ bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC&
 {
    destDC.SetClippingRegion(destRect);

-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())
        wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap());

    m_canvas->DrawShapes(destDC);
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -37,6 +37,7 @@
 #include "wx/overlay.h"
 #include "wx/graphics.h"
 #include "wx/filename.h"
+#include "wx/metafile.h"

 #define TEST_CAIRO_EVERYWHERE 0

@@ -101,6 +102,8 @@ public:
 #if wxUSE_GRAPHICS_CONTEXT
    void OnGraphicContext(wxCommandEvent& event);
 #endif
+    void OnCopy(wxCommandEvent& event);
+    void OnSave(wxCommandEvent& event);
    void OnShow(wxCommandEvent &event);
    void OnOption(wxCommandEvent &event);

@@ -146,6 +149,7 @@ public:
 #if wxUSE_GRAPHICS_CONTEXT
    void UseGraphicContext(bool use) { m_useContext = use; Refresh(); }
 #endif
+    void Draw(wxDC& dc);

 protected:
    enum DrawMode
@@ -224,6 +228,8 @@ enum
 #if wxUSE_GRAPHICS_CONTEXT
    File_GraphicContext,
 #endif
+    File_Copy,
+    File_Save,

    MenuOption_First,

@@ -359,6 +365,9 @@ bool MyApp::OnInit()
        // still continue, the sample can be used without images too if they're
        // missing for whatever reason
    }
+#if wxUSE_LIBPNG
+      wxImage::AddHandler( new wxPNGHandler );
+#endif

    return true;
 }
@@ -580,7 +589,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
    // rectangle above)
    //dc.SetBrush( *wxTRANSPARENT_BRUSH );

-    if (m_smile_bmp.Ok())
+    if (m_smile_bmp.IsOk())
        dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true);

    dc.SetBrush( *wxBLACK_BRUSH );
@@ -1468,7 +1477,7 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
    dc.SetBrush( *wxGREY_BRUSH );
    dc.DrawRectangle( x, y, 310, 310 );

-    if (m_smile_bmp.Ok())
+    if (m_smile_bmp.IsOk())
    {
        dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true );
        dc.DrawBitmap( m_smile_bmp, x + 130, y + 10,  true );
@@ -1478,21 +1487,47 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
    }
 }

-#if TEST_CAIRO_EVERYWHERE
-extern wxGraphicsRenderer* gCairoRenderer;
-#endif
-
 void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
    wxPaintDC pdc(this);
+    Draw(pdc);
+}

+void MyCanvas::Draw(wxDC& pdc)
+{
 #if wxUSE_GRAPHICS_CONTEXT
-#if TEST_CAIRO_EVERYWHERE
    wxGCDC gdc;
-    gdc.SetGraphicsContext( gCairoRenderer->CreateContext( pdc ) );
+    wxGraphicsRenderer* const renderer = wxGraphicsRenderer::
+#if TEST_CAIRO_EVERYWHERE
+        GetCairoRenderer()
 #else
-     wxGCDC gdc( pdc ) ;
+        GetDefaultRenderer()
 #endif
+        ;
+
+    wxGraphicsContext* context;
+    if ( wxPaintDC *paintdc = wxDynamicCast(&pdc, wxPaintDC) )
+    {
+        context = renderer->CreateContext(*paintdc);
+    }
+    else if ( wxMemoryDC *memdc = wxDynamicCast(&pdc, wxMemoryDC) )
+    {
+        context = renderer->CreateContext(*memdc);
+    }
+#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH)
+    else if ( wxMetafileDC *metadc = wxDynamicCast(&pdc, wxMetafileDC) )
+    {
+        context = renderer->CreateContext(*metadc);
+    }
+#endif
+    else
+    {
+        wxFAIL_MSG( "Unknown wxDC kind" );
+        return;
+    }
+
+    gdc.SetGraphicsContext(context);
+
    wxDC &dc = m_useContext ? (wxDC&) gdc : (wxDC&) pdc ;
 #else
    wxDC &dc = pdc ;
@@ -1503,15 +1538,15 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
    m_owner->PrepareDC(dc);

    dc.SetBackgroundMode( m_owner->m_backgroundMode );
-    if ( m_owner->m_backgroundBrush.Ok() )
+    if ( m_owner->m_backgroundBrush.IsOk() )
        dc.SetBackground( m_owner->m_backgroundBrush );
-    if ( m_owner->m_colourForeground.Ok() )
+    if ( m_owner->m_colourForeground.IsOk() )
        dc.SetTextForeground( m_owner->m_colourForeground );
-    if ( m_owner->m_colourBackground.Ok() )
+    if ( m_owner->m_colourBackground.IsOk() )
        dc.SetTextBackground( m_owner->m_colourBackground );

    if ( m_owner->m_textureBackground) {
-        if ( ! m_owner->m_backgroundBrush.Ok() ) {
+        if ( ! m_owner->m_backgroundBrush.IsOk() ) {
            wxColour clr(0,128,0);
            wxBrush b(clr, wxSOLID);
            dc.SetBackground(b);
@@ -1691,6 +1726,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_GRAPHICS_CONTEXT
    EVT_MENU      (File_GraphicContext, MyFrame::OnGraphicContext)
 #endif
+    EVT_MENU      (File_Copy,     MyFrame::OnCopy)
+    EVT_MENU      (File_Save,     MyFrame::OnSave)

    EVT_MENU_RANGE(MenuShow_First,   MenuShow_Last,   MyFrame::OnShow)

@@ -1719,7 +1756,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_GRAPHICS_CONTEXT
    menuFile->Append(File_ShowAlpha, wxT("&Alpha screen\tF10"));
 #endif
-    menuFile->Append(File_ShowSplines, wxT("&Splines screen\tF11"));
+    menuFile->Append(File_ShowSplines, wxT("Spl&ines screen\tF11"));
    menuFile->Append(File_ShowGradients, wxT("&Gradients screen\tF12"));
 #if wxUSE_GRAPHICS_CONTEXT
     menuFile->Append(File_ShowGraphics, wxT("&Graphics screen"));
@@ -1730,6 +1767,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    menuFile->AppendCheckItem(File_GraphicContext, wxT("&Use GraphicContext\tCtrl-Y"), wxT("Use GraphicContext"));
 #endif
    menuFile->AppendSeparator();
+#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH)
+    menuFile->Append(File_Copy, wxT("Copy to clipboard"));
+#endif
+    menuFile->Append(File_Save, wxT("&Save...\tCtrl-S"), wxT("Save drawing to file"));
+    menuFile->AppendSeparator();
    menuFile->Append(File_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
    menuFile->AppendSeparator();
    menuFile->Append(File_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
@@ -1836,6 +1878,38 @@ void MyFrame::OnGraphicContext(wxCommandEvent& event)
 }
 #endif

+void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH)
+    wxMetafileDC dc;
+    if (!dc.IsOk())
+        return;
+    m_canvas->Draw(dc);
+    wxMetafile *mf = dc.Close();
+    if (!mf)
+        return;
+    mf->SetClipboard();
+    delete mf;
+#endif
+}
+
+void MyFrame::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+    wxFileDialog dlg(this, wxT("Save as bitmap"), wxT(""), wxT(""),
+#if wxUSE_LIBPNG
+                     wxT("PNG image (*.png)|*.png;*.PNG|")
+#endif
+                     wxT("Bitmap image (*.bmp)|*.bmp;*.BMP"),
+                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+    if (dlg.ShowModal() == wxID_OK)
+    {
+        wxBitmap bmp(500, 800);
+        wxMemoryDC mdc(bmp);
+        m_canvas->Draw(mdc);
+        bmp.ConvertToImage().SaveFile(dlg.GetPath());
+    }
+}
+
 void MyFrame::OnShow(wxCommandEvent& event)
 {
    m_canvas->ToShow(event.GetId());
@@ -1916,7 +1990,7 @@ void MyFrame::OnOption(wxCommandEvent& event)
        case Colour_Background:
            {
                wxColour col = SelectColour();
-                if ( col.Ok() )
+                if ( col.IsOk() )
                {
                    m_backgroundBrush.SetColour(col);
                }
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -503,7 +503,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    m_lbox = new wxListBox(this, wxID_ANY);
    wxFont font(12, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
                wxFONTWEIGHT_NORMAL);
-    if ( font.Ok() )
+    if ( font.IsOk() )
        m_lbox->SetFont(font);

 #if wxUSE_STATUSBAR
@@ -1470,8 +1470,8 @@ void MyPipeFrame::DoGetFromStream(wxTextCtrl *text, wxInputStream& in)
 {
    while ( in.CanRead() )
    {
-        wxChar buffer[4096];
-        buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = wxT('\0');
+        char buffer[4096];
+        buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = '\0';

        text->AppendText(buffer);
    }
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -553,7 +553,7 @@ void MyFrame::OnSetNativeDesc(wxCommandEvent& WXUNUSED(event))

    wxFont font;
    font.SetNativeFontInfo(fontInfo);
-    if ( !font.Ok() )
+    if ( !font.IsOk() )
    {
        wxLogError(wxT("Font info string \"%s\" is invalid."),
                   fontInfo.c_str());
@@ -576,12 +576,12 @@ void MyFrame::OnSetNativeUserDesc(wxCommandEvent& WXUNUSED(event))
    wxFont font;
    if (font.SetNativeFontInfoUserDesc(fontUserInfo))
    {
-        wxASSERT_MSG(font.Ok(), wxT("The font should now be valid"));
+        wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid"));
        DoChangeFont(font);
    }
    else
    {
-        wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid"));
+        wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid"));
        wxMessageBox(wxT("Error trying to create a font with such description..."));
    }
 }
@@ -608,12 +608,12 @@ void MyFrame::OnSetFaceName(wxCommandEvent& WXUNUSED(event))
    wxFont font(GetCanvas()->GetTextFont());
    if (font.SetFaceName(newFaceName))      // change facename only
    {
-        wxASSERT_MSG(font.Ok(), wxT("The font should now be valid"));
+        wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid"));
        DoChangeFont(font);
    }
    else
    {
-        wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid"));
+        wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid"));
        wxMessageBox(wxT("There is no font with such face name..."),
                     wxT("Invalid face name"), wxOK|wxICON_ERROR, this);
    }
@@ -806,12 +806,12 @@ void MyFrame::OnwxSystemSettingsFont(wxCommandEvent& event)
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
    m_canvas->SetTextFont(font);
-    if ( col.Ok() )
+    if ( col.IsOk() )
        m_canvas->SetColour(col);
    m_canvas->Refresh();

    m_textctrl->SetFont(font);
-    if ( col.Ok() )
+    if ( col.IsOk() )
        m_textctrl->SetForegroundColour(col);

    // update the state of the bold/italic/underlined menu items
@@ -968,7 +968,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
                    wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
                    wxFONTWEIGHT_NORMAL, false /* !underlined */,
                    wxEmptyString /* facename */, fontenc);
-        if ( font.Ok() )
+        if ( font.IsOk() )
        {
            DoChangeFont(font);
        }
@@ -1047,7 +1047,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    dc.DrawText(fontInfo, x, y);
    y += hLine;

-    if ( m_font.Ok() )
+    if ( m_font.IsOk() )
    {
        const wxNativeFontInfo *info = m_font.GetNativeFontInfo();
        if ( info )
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -32,7 +32,9 @@ public:
    MyFrame(const wxString& title);
    virtual ~MyFrame();

-    void AddDirectory(const wxString& dir);
+    // Add an entry of the specified type asking the user for the filename if
+    // the one passed to this function is empty.
+    void AddEntry(wxFSWPathType type, wxString filename = wxString());

    bool CreateWatcherIfNecessary();

@@ -47,6 +49,7 @@ private:
    void OnAbout(wxCommandEvent& event);

    void OnAdd(wxCommandEvent& event);
+    void OnAddTree(wxCommandEvent& event);
    void OnRemove(wxCommandEvent& event);

    void OnFileSystemEvent(wxFileSystemWatcherEvent& event);
@@ -87,7 +90,7 @@ public:
        if ( m_frame->CreateWatcherIfNecessary() )
        {
            if ( !m_dirToWatch.empty() )
-                m_frame->AddDirectory(m_dirToWatch);
+                m_frame->AddEntry(wxFSWPath_Dir, m_dirToWatch);
        }
    }

@@ -144,7 +147,8 @@ MyFrame::MyFrame(const wxString& title)
        MENU_ID_WATCH = 101,

        BTN_ID_ADD = 200,
-        BTN_ID_REMOVE = 201,
+        BTN_ID_ADD_TREE,
+        BTN_ID_REMOVE
    };

    // ================================================================
@@ -194,9 +198,11 @@ MyFrame::MyFrame(const wxString& title)

    // buttons
    wxButton* buttonAdd = new wxButton(panel, BTN_ID_ADD, "&Add");
+    wxButton* buttonAddTree = new wxButton(panel, BTN_ID_ADD_TREE, "Add &tree");
    wxButton* buttonRemove = new wxButton(panel, BTN_ID_REMOVE, "&Remove");
    wxSizer *btnSizer = new wxGridSizer(2);
    btnSizer->Add(buttonAdd, wxSizerFlags().Center().Border(wxALL));
+    btnSizer->Add(buttonAddTree, wxSizerFlags().Center().Border(wxALL));
    btnSizer->Add(buttonRemove, wxSizerFlags().Center().Border(wxALL));

    // and put it all together
@@ -253,6 +259,8 @@ MyFrame::MyFrame(const wxString& title)
    // buttons
    Connect(BTN_ID_ADD, wxEVT_COMMAND_BUTTON_CLICKED,
            wxCommandEventHandler(MyFrame::OnAdd));
+    Connect(BTN_ID_ADD_TREE, wxEVT_COMMAND_BUTTON_CLICKED,
+            wxCommandEventHandler(MyFrame::OnAddTree));
    Connect(BTN_ID_REMOVE, wxEVT_COMMAND_BUTTON_CLICKED,
            wxCommandEventHandler(MyFrame::OnRemove));

@@ -318,29 +326,54 @@ void MyFrame::OnWatch(wxCommandEvent& event)

 void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event))
 {
-    wxCHECK_RET(m_watcher, "Watcher not initialized");
-
-    // TODO account for adding the files as well
-    const wxString& dir = wxDirSelector("Choose a folder to watch", "",
-                                    wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
-    if ( dir.empty() )
-        return;
-
-    AddDirectory(dir);
+    AddEntry(wxFSWPath_Dir);
 }

-void MyFrame::AddDirectory(const wxString& dir)
+void MyFrame::OnAddTree(wxCommandEvent& WXUNUSED(event))
 {
-    wxLogDebug("Adding directory: '%s'", dir);
+    AddEntry(wxFSWPath_Tree);
+}

-    if (!m_watcher->Add(wxFileName::DirName(dir), wxFSW_EVENT_ALL))
+void MyFrame::AddEntry(wxFSWPathType type, wxString filename)
+{
+    if ( filename.empty() )
    {
-        wxLogError("Error adding '%s' to watched paths", dir);
+        // TODO account for adding the files as well
+        filename = wxDirSelector("Choose a folder to watch", "",
+                                 wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
+        if ( filename.empty() )
+            return;
    }
-    else
+
+    wxCHECK_RET(m_watcher, "Watcher not initialized");
+
+    wxLogDebug("Adding %s: '%s'",
+               filename,
+               type == wxFSWPath_Dir ? "directory" : "directory tree");
+
+    bool ok = false;
+    switch ( type )
    {
-        m_filesList->InsertItem(m_filesList->GetItemCount(), dir);
+        case wxFSWPath_Dir:
+            ok = m_watcher->Add(wxFileName::DirName(filename));
+            break;
+
+        case wxFSWPath_Tree:
+            ok = m_watcher->AddTree(wxFileName::DirName(filename));
+            break;
+
+        case wxFSWPath_File:
+        case wxFSWPath_None:
+            wxFAIL_MSG( "Unexpected path type." );
    }
+
+    if (!ok)
+    {
+        wxLogError("Error adding '%s' to watched paths", filename);
+        return;
+    }
+
+    m_filesList->InsertItem(m_filesList->GetItemCount(), filename);
 }

 void MyFrame::OnRemove(wxCommandEvent& WXUNUSED(event))
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -702,7 +702,7 @@ void GridFrame::SetLabelTextColour( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetLabelFont( wxCommandEvent& WXUNUSED(ev) )
 {
    wxFont font = wxGetFontFromUser(this);
-    if ( font.Ok() )
+    if ( font.IsOk() )
    {
        grid->SetLabelFont(font);
    }
@@ -945,7 +945,7 @@ void GridFrame::SelectRowsOrCols( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 {
    wxColour col = wxGetColourFromUser(this);
-    if ( col.Ok() )
+    if ( col.IsOk() )
    {
        grid->SetDefaultCellTextColour(col);
        grid->Refresh();
@@ -955,7 +955,7 @@ void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
 {
    wxColour col = wxGetColourFromUser(this);
-    if ( col.Ok() )
+    if ( col.IsOk() )
    {
        // Check the new Refresh function by passing it a rectangle
        // which exactly fits the grid.
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -449,7 +449,7 @@ void MyFrame::OnGetItemRect(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
    wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());
-    if ( col.Ok() )
+    if ( col.IsOk() )
    {
        m_hlbox->SetBackgroundColour(col);
        m_hlbox->Refresh();
@@ -463,7 +463,7 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
 {
    wxColour col = wxGetColourFromUser(this, m_hlbox->GetSelectionBackground());
-    if ( col.Ok() )
+    if ( col.IsOk() )
    {
        m_hlbox->SetSelectionBackground(col);
        m_hlbox->Refresh();
--- a/samples/image/canvas.cpp
+++ b/samples/image/canvas.cpp
@@ -272,7 +272,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                                smile_height, 1 );

    // demonstrates XPM automatically using the mask when saving
-    if ( m_bmpSmileXpm.Ok() )
+    if ( m_bmpSmileXpm.IsOk() )
        m_bmpSmileXpm.SaveFile(wxT("saved.xpm"), wxBITMAP_TYPE_XPM);

 #if wxUSE_ICO_CUR
@@ -389,7 +389,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    PrepareDC( dc );

    dc.DrawText( wxT("Loaded image"), 30, 10 );
-    if (my_square.Ok())
+    if (my_square.IsOk())
        dc.DrawBitmap( my_square, 30, 30 );

    dc.DrawText( wxT("Drawn directly"), 150, 10 );
@@ -399,11 +399,11 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    dc.SetBrush( *wxWHITE_BRUSH );
    dc.DrawRectangle( 170, 50, 60, 60 );

-    if (my_anti.Ok())
+    if (my_anti.IsOk())
        dc.DrawBitmap( my_anti, 280, 30 );

    dc.DrawText( wxT("PNG handler"), 30, 135 );
-    if (my_horse_png.Ok())
+    if (my_horse_png.IsOk())
    {
        dc.DrawBitmap( my_horse_png, 30, 150 );
        wxRect rect(0,0,100,100);
@@ -413,55 +413,55 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    }

    dc.DrawText( wxT("JPEG handler"), 30, 365 );
-    if (my_horse_jpeg.Ok())
+    if (my_horse_jpeg.IsOk())
        dc.DrawBitmap( my_horse_jpeg, 30, 380 );

    dc.DrawText( wxT("Green rotated to red"), 280, 365 );
-    if (colorized_horse_jpeg.Ok())
+    if (colorized_horse_jpeg.IsOk())
        dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );

    dc.DrawText( wxT("CMYK JPEG image"), 530, 365 );
-    if (my_cmyk_jpeg.Ok())
+    if (my_cmyk_jpeg.IsOk())
        dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );

    dc.DrawText( wxT("GIF handler"), 30, 595 );
-    if (my_horse_gif.Ok())
+    if (my_horse_gif.IsOk())
        dc.DrawBitmap( my_horse_gif, 30, 610 );

    dc.DrawText( wxT("PCX handler"), 30, 825 );
-    if (my_horse_pcx.Ok())
+    if (my_horse_pcx.IsOk())
        dc.DrawBitmap( my_horse_pcx, 30, 840 );

    dc.DrawText( wxT("BMP handler"), 30, 1055 );
-    if (my_horse_bmp.Ok())
+    if (my_horse_bmp.IsOk())
        dc.DrawBitmap( my_horse_bmp, 30, 1070 );

    dc.DrawText( wxT("BMP read from memory"), 280, 1055 );
-    if (my_horse_bmp2.Ok())
+    if (my_horse_bmp2.IsOk())
        dc.DrawBitmap( my_horse_bmp2, 280, 1070 );

    dc.DrawText( wxT("PNM handler"), 30, 1285 );
-    if (my_horse_pnm.Ok())
+    if (my_horse_pnm.IsOk())
        dc.DrawBitmap( my_horse_pnm, 30, 1300 );

    dc.DrawText( wxT("PNM handler (ascii grey)"), 280, 1285 );
-    if (my_horse_asciigrey_pnm.Ok())
+    if (my_horse_asciigrey_pnm.IsOk())
        dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 );

    dc.DrawText( wxT("PNM handler (raw grey)"), 530, 1285 );
-    if (my_horse_rawgrey_pnm.Ok())
+    if (my_horse_rawgrey_pnm.IsOk())
        dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 );

    dc.DrawText( wxT("TIFF handler"), 30, 1515 );
-    if (my_horse_tiff.Ok())
+    if (my_horse_tiff.IsOk())
        dc.DrawBitmap( my_horse_tiff, 30, 1530 );

    dc.DrawText( wxT("TGA handler"), 30, 1745 );
-    if (my_horse_tga.Ok())
+    if (my_horse_tga.IsOk())
        dc.DrawBitmap( my_horse_tga, 30, 1760 );

    dc.DrawText( wxT("XPM handler"), 30, 1975 );
-    if (my_horse_xpm.Ok())
+    if (my_horse_xpm.IsOk())
        dc.DrawBitmap( my_horse_xpm, 30, 2000 );

    // toucans
@@ -501,7 +501,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
        dc.DrawBitmap(my_toucan_blur, x, y+15, true);
    }

-    if (my_smile_xbm.Ok())
+    if (my_smile_xbm.IsOk())
    {
        int x = 300, y = 1800;

@@ -543,7 +543,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    memdc.DrawLine( 5, 42, 50, 42 );
    memdc.SelectObject( wxNullBitmap );

-    if (mono.Ok())
+    if (mono.IsOk())
    {
        int x = 300, y = 1900;

@@ -572,20 +572,20 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    dc.DrawRectangle( 20, 2220, 560, 68 );

    dc.DrawText(wxT("XPM bitmap"), 30, 2230 );
-    if ( m_bmpSmileXpm.Ok() )
+    if ( m_bmpSmileXpm.IsOk() )
        dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);

    dc.DrawText(wxT("XPM icon"), 110, 2230 );
-    if ( m_iconSmileXpm.Ok() )
+    if ( m_iconSmileXpm.IsOk() )
        dc.DrawIcon(m_iconSmileXpm, 110, 2250);

    // testing icon -> bitmap conversion
    wxBitmap to_blit( m_iconSmileXpm );
-    if (to_blit.Ok())
+    if (to_blit.IsOk())
    {
        dc.DrawText( wxT("SubBitmap"), 170, 2230 );
        wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
-        if (sub.Ok())
+        if (sub.IsOk())
            dc.DrawBitmap( sub, 170, 2250, true );

        dc.DrawText( wxT("Enlarged"), 250, 2230 );
@@ -607,19 +607,19 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    }

    dc.DrawText( wxT("ICO handler (1st image)"), 30, 2290 );
-    if (my_horse_ico32.Ok())
+    if (my_horse_ico32.IsOk())
        dc.DrawBitmap( my_horse_ico32, 30, 2330, true );

    dc.DrawText( wxT("ICO handler (2nd image)"), 230, 2290 );
-    if (my_horse_ico16.Ok())
+    if (my_horse_ico16.IsOk())
        dc.DrawBitmap( my_horse_ico16, 230, 2330, true );

    dc.DrawText( wxT("ICO handler (best image)"), 430, 2290 );
-    if (my_horse_ico.Ok())
+    if (my_horse_ico.IsOk())
        dc.DrawBitmap( my_horse_ico, 430, 2330, true );

    dc.DrawText( wxT("CUR handler"), 30, 2390 );
-    if (my_horse_cur.Ok())
+    if (my_horse_cur.IsOk())
    {
        dc.DrawBitmap( my_horse_cur, 30, 2420, true );
        dc.SetPen (*wxRED_PEN);
@@ -630,7 +630,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
    dc.DrawText( wxT("ANI handler"), 230, 2390 );
    for ( int i=0; i < m_ani_images; i++ )
    {
-        if (my_horse_ani[i].Ok())
+        if (my_horse_ani[i].IsOk())
        {
            dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
        }
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -407,7 +407,7 @@ private:

        wxImage img(m_bitmap.ConvertToImage());
        img = img.Rotate(angle, wxPoint(img.GetWidth() / 2, img.GetHeight() / 2));
-        if ( !img.Ok() )
+        if ( !img.IsOk() )
        {
            wxLogWarning(wxT("Rotation failed"));
            return;
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -70,13 +70,13 @@ const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] =
 static const int NUM_ICONS = 9;

 int wxCALLBACK
-MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData))
+MyCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData))
 {
    // inverse the order
    if (item1 < item2)
-        return -1;
-    if (item1 > item2)
        return 1;
+    if (item1 > item2)
+        return -1;

    return 0;
 }
--- a/samples/minimal/Info_carbon.plist
+++ b/samples/minimal/Info_carbon.plist
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleGetInfoString</key>
+	<string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+	<key>CFBundleIconFile</key>
+	<string>wxmac.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>de</string>
+		<string>en</string>
+		<string>fr</string>
+		<string>it</string>
+	</array>
+	<key>CFBundleLongVersionString</key>
+	<string>2.9.3, (c) 2005-2011 wxWidgets</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.9.3</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2.9.3</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2005-2011 wxWidgets</string>
+</dict>
+</plist>
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleGetInfoString</key>
+	<string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+	<key>CFBundleIconFile</key>
+	<string>wxmac.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>de</string>
+		<string>en</string>
+		<string>fr</string>
+		<string>it</string>
+	</array>
+	<key>CFBundleLongVersionString</key>
+	<string>2.9.3, (c) 2005-2011 wxWidgets</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.9.3</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2.9.3</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2005-2011 wxWidgets</string>
+</dict>
+</plist>
--- a/samples/minimal/Info_iphone.plist
+++ b/samples/minimal/Info_iphone.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSMainNibFile</key>
+	<string></string>
+</dict>
+</plist>
--- a/samples/minimal/minimal.xcode/project.pbxproj
+++ b/samples/minimal/minimal.xcode/project.pbxproj
@@ -1,825 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 39;
-	objects = {
-		05952DFCFFF02D1B11CA0E50 = {
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				ZERO_LINK = YES;
-			};
-			isa = PBXBuildStyle;
-			name = Development;
-		};
-		05952DFDFFF02D1B11CA0E50 = {
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				ZERO_LINK = NO;
-			};
-			isa = PBXBuildStyle;
-			name = Deployment;
-		};
-//050
-//051
-//052
-//053
-//054
-//190
-//191
-//192
-//193
-//194
-		195DF8C9FE9D4F0611CA2CBB = {
-			children = (
-				4086D0F0063BBC5B00D4CD53,
-				4086D100063BBC5C00D4CD53,
-				4086D110063BBC5C00D4CD53,
-				4086D120063BBC5C00D4CD53,
-			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//190
-//191
-//192
-//193
-//194
-//200
-//201
-//202
-//203
-//204
-		20286C28FDCF999611CA2CEA = {
-			buildSettings = {
-			};
-			buildStyles = (
-				05952DFCFFF02D1B11CA0E50,
-				05952DFDFFF02D1B11CA0E50,
-			);
-			hasScannedForEncodings = 1;
-			isa = PBXProject;
-			mainGroup = 20286C29FDCF999611CA2CEA;
-			projectDirPath = "";
-			targets = (
-				4086D0E2063BBC5B00D4CD53,
-				4086D0F2063BBC5B00D4CD53,
-				4086D102063BBC5C00D4CD53,
-				4086D112063BBC5C00D4CD53,
-				405DD1B0063CD57F00F579EE,
-			);
-		};
-		20286C29FDCF999611CA2CEA = {
-			children = (
-				20286C2AFDCF999611CA2CEA,
-				20286C2CFDCF999611CA2CEA,
-				20286C32FDCF999611CA2CEA,
-				195DF8C9FE9D4F0611CA2CBB,
-				4086D0EF063BBC5B00D4CD53,
-			);
-			isa = PBXGroup;
-			name = "¬´PROJECTNAME¬ª";
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA = {
-			children = (
-				F591E05701FCC5DE01000133,
-			);
-			isa = PBXGroup;
-			name = Sources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA = {
-			children = (
-				F5F5A69A02CDB0E101000133,
-			);
-			isa = PBXGroup;
-			name = Resources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA = {
-			children = (
-				F5F5A69602CDB02701000133,
-				F5A0C6B502CF7C9601000133,
-				CA89578E04D706FC00000080,
-				CA89596C04D79FED00000080,
-				20286C33FDCF999611CA2CEA,
-				CA60173504D423C000000080,
-				40B6DFF2063CD7B000442FB3,
-			);
-			isa = PBXGroup;
-			name = "External Frameworks and Libraries";
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C33FDCF999611CA2CEA = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = Carbon.framework;
-			path = /System/Library/Frameworks/Carbon.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-//200
-//201
-//202
-//203
-//204
-//400
-//401
-//402
-//403
-//404
-		405DD1B0063CD57F00F579EE = {
-			buildPhases = (
-			);
-			buildSettings = {
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Build All";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-			};
-			dependencies = (
-				405DD1C2063CD5B500F579EE,
-				405DD1C4063CD5B500F579EE,
-				405DD1C6063CD5B500F579EE,
-				405DD1C8063CD5B500F579EE,
-			);
-			isa = PBXAggregateTarget;
-			name = "Build All";
-			productName = "Build All";
-		};
-		405DD1C1063CD5B500F579EE = {
-			containerPortal = 20286C28FDCF999611CA2CEA;
-			isa = PBXContainerItemProxy;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D0E2063BBC5B00D4CD53;
-			remoteInfo = StaticDebug;
-		};
-		405DD1C2063CD5B500F579EE = {
-			isa = PBXTargetDependency;
-			target = 4086D0E2063BBC5B00D4CD53;
-			targetProxy = 405DD1C1063CD5B500F579EE;
-		};
-		405DD1C3063CD5B500F579EE = {
-			containerPortal = 20286C28FDCF999611CA2CEA;
-			isa = PBXContainerItemProxy;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D0F2063BBC5B00D4CD53;
-			remoteInfo = StaticRelease;
-		};
-		405DD1C4063CD5B500F579EE = {
-			isa = PBXTargetDependency;
-			target = 4086D0F2063BBC5B00D4CD53;
-			targetProxy = 405DD1C3063CD5B500F579EE;
-		};
-		405DD1C5063CD5B500F579EE = {
-			containerPortal = 20286C28FDCF999611CA2CEA;
-			isa = PBXContainerItemProxy;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D102063BBC5C00D4CD53;
-			remoteInfo = DynamicDebug;
-		};
-		405DD1C6063CD5B500F579EE = {
-			isa = PBXTargetDependency;
-			target = 4086D102063BBC5C00D4CD53;
-			targetProxy = 405DD1C5063CD5B500F579EE;
-		};
-		405DD1C7063CD5B500F579EE = {
-			containerPortal = 20286C28FDCF999611CA2CEA;
-			isa = PBXContainerItemProxy;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D112063BBC5C00D4CD53;
-			remoteInfo = DynamicRelease;
-		};
-		405DD1C8063CD5B500F579EE = {
-			isa = PBXTargetDependency;
-			target = 4086D112063BBC5C00D4CD53;
-			targetProxy = 405DD1C7063CD5B500F579EE;
-		};
-		4086D0E2063BBC5B00D4CD53 = {
-			buildPhases = (
-				4086D0E3063BBC5B00D4CD53,
-				4086D0E4063BBC5B00D4CD53,
-				4086D0E6063BBC5B00D4CD53,
-				4086D0E8063BBC5B00D4CD53,
-				4086D0ED063BBC5B00D4CD53,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES  __WXMAC_XCODE__=1 WX_PRECOMP=1";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxStaticDebug.build/DerivedSources/include ../../src/build/include ../../include . - /usr/include";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = minimalStaticDebug;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXNativeTarget;
-			name = StaticDebug;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalStaticDebug;
-			productReference = 4086D0F0063BBC5B00D4CD53;
-			productType = "com.apple.product-type.application";
-		};
-		4086D0E3063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0E4063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0E5063BBC5B00D4CD53,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0E5063BBC5B00D4CD53 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0E6063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0E7063BBC5B00D4CD53,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0E7063BBC5B00D4CD53 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0E8063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0E9063BBC5B00D4CD53,
-				4086D0EB063BBC5B00D4CD53,
-				4086D0EC063BBC5B00D4CD53,
-				40B6DFF3063CD7B000442FB3,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0E9063BBC5B00D4CD53 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0EB063BBC5B00D4CD53 = {
-			fileRef = F5F5A69602CDB02701000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0EC063BBC5B00D4CD53 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0ED063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0EF063BBC5B00D4CD53 = {
-			isa = PBXFileReference;
-			lastKnownFileType = text.xml;
-			path = Info.plist;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		4086D0F0063BBC5B00D4CD53 = {
-			explicitFileType = wrapper.application;
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = minimalStaticDebug.app;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		4086D0F2063BBC5B00D4CD53 = {
-			buildPhases = (
-				4086D0F3063BBC5B00D4CD53,
-				4086D0F4063BBC5B00D4CD53,
-				4086D0F6063BBC5B00D4CD53,
-				4086D0F8063BBC5B00D4CD53,
-				4086D0FD063BBC5B00D4CD53,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxStaticRelease.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = minimalStaticRelease;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXNativeTarget;
-			name = StaticRelease;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalStaticDebug;
-			productReference = 4086D100063BBC5C00D4CD53;
-			productType = "com.apple.product-type.application";
-		};
-		4086D0F3063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0F4063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0F5063BBC5B00D4CD53,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0F5063BBC5B00D4CD53 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0F6063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0F7063BBC5B00D4CD53,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0F7063BBC5B00D4CD53 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0F8063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D0F9063BBC5B00D4CD53,
-				4086D0FB063BBC5B00D4CD53,
-				4086D0FC063BBC5B00D4CD53,
-				40B6DFF4063CD7B000442FB3,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D0F9063BBC5B00D4CD53 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0FB063BBC5B00D4CD53 = {
-			fileRef = F5A0C6B502CF7C9601000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0FC063BBC5B00D4CD53 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D0FD063BBC5B00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D100063BBC5C00D4CD53 = {
-			explicitFileType = wrapper.application;
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = minimalStaticRelease.app;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		4086D102063BBC5C00D4CD53 = {
-			buildPhases = (
-				40ADC58D081629DD0009DA36,
-				4086D103063BBC5C00D4CD53,
-				4086D104063BBC5C00D4CD53,
-				4086D106063BBC5C00D4CD53,
-				4086D108063BBC5C00D4CD53,
-				4086D10D063BBC5C00D4CD53,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ WXUSINGDLL __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicDebug.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = minimalDynamicDebug;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXNativeTarget;
-			name = DynamicDebug;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalDynamicDebug;
-			productReference = 4086D110063BBC5C00D4CD53;
-			productType = "com.apple.product-type.application";
-		};
-		4086D103063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D104063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D105063BBC5C00D4CD53,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D105063BBC5C00D4CD53 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D106063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D107063BBC5C00D4CD53,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D107063BBC5C00D4CD53 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D108063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D109063BBC5C00D4CD53,
-				4086D10B063BBC5C00D4CD53,
-				4086D10C063BBC5C00D4CD53,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D109063BBC5C00D4CD53 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D10B063BBC5C00D4CD53 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D10C063BBC5C00D4CD53 = {
-			fileRef = CA89578E04D706FC00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D10D063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D110063BBC5C00D4CD53 = {
-			explicitFileType = wrapper.application;
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = minimalDynamicDebug.app;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		4086D112063BBC5C00D4CD53 = {
-			buildPhases = (
-				40ADC6C508163A7C0009DA36,
-				4086D113063BBC5C00D4CD53,
-				4086D114063BBC5C00D4CD53,
-				4086D116063BBC5C00D4CD53,
-				4086D118063BBC5C00D4CD53,
-				4086D11D063BBC5C00D4CD53,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA WXUSINGDLL __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicRelease.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = minimalDynamicRelease;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXNativeTarget;
-			name = DynamicRelease;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalDynamicRelease;
-			productReference = 4086D120063BBC5C00D4CD53;
-			productType = "com.apple.product-type.application";
-		};
-		4086D113063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D114063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D115063BBC5C00D4CD53,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D115063BBC5C00D4CD53 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D116063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D117063BBC5C00D4CD53,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D117063BBC5C00D4CD53 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D118063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-				4086D119063BBC5C00D4CD53,
-				4086D11B063BBC5C00D4CD53,
-				4086D11C063BBC5C00D4CD53,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D119063BBC5C00D4CD53 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D11B063BBC5C00D4CD53 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D11C063BBC5C00D4CD53 = {
-			fileRef = CA89596C04D79FED00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086D11D063BBC5C00D4CD53 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D120063BBC5C00D4CD53 = {
-			explicitFileType = wrapper.application;
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = minimalDynamicRelease.app;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		40ADC58D081629DD0009DA36 = {
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				40ADC58E081629E80009DA36,
-			);
-			isa = PBXCopyFilesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		40ADC58E081629E80009DA36 = {
-			fileRef = CA89578E04D706FC00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		40ADC6C508163A7C0009DA36 = {
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				40ADC6C608163A8B0009DA36,
-			);
-			isa = PBXCopyFilesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		40ADC6C608163A8B0009DA36 = {
-			fileRef = CA89596C04D79FED00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		40B6DFF2063CD7B000442FB3 = {
-			isa = PBXFileReference;
-			lastKnownFileType = "compiled.mach-o.dylib";
-			name = libiconv.dylib;
-			path = /usr/lib/libiconv.dylib;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		40B6DFF3063CD7B000442FB3 = {
-			fileRef = 40B6DFF2063CD7B000442FB3;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		40B6DFF4063CD7B000442FB3 = {
-			fileRef = 40B6DFF2063CD7B000442FB3;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//400
-//401
-//402
-//403
-//404
-//CA0
-//CA1
-//CA2
-//CA3
-//CA4
-		CA60173504D423C000000080 = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = System.framework;
-			path = /System/Library/Frameworks/System.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		CA89578E04D706FC00000080 = {
-			explicitFileType = "compiled.mach-o.dylib";
-			isa = PBXFileReference;
-			name = libwx_macd.dylib;
-			path = ../../src/build/libwx_macd.dylib;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		CA89596C04D79FED00000080 = {
-			isa = PBXFileReference;
-			lastKnownFileType = "compiled.mach-o.dylib";
-			name = libwx_mac.dylib;
-			path = ../../src/build/libwx_mac.dylib;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-//CA0
-//CA1
-//CA2
-//CA3
-//CA4
-//F50
-//F51
-//F52
-//F53
-//F54
-		F591E05701FCC5DE01000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = minimal.cpp;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		F5A0C6B502CF7C9601000133 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libwx_mac.a;
-			path = ../../src/build/libwx_mac.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		F5F5A69602CDB02701000133 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libwx_macd.a;
-			path = ../../src/build/libwx_macd.a;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-		F5F5A69A02CDB0E101000133 = {
-			isa = PBXFileReference;
-			lastKnownFileType = image.icns;
-			name = wxmac.icns;
-			path = ../../src/mac/wxmac.icns;
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
-	};
-	rootObject = 20286C28FDCF999611CA2CEA;
-}
--- a/samples/minimal/minimal.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal.xcodeproj/project.pbxproj
@@ -1,672 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		405DD1B0063CD57F00F579EE /* Build All */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 1842CAB008565A280032BCF7 /* Build configuration list for PBXAggregateTarget "Build All" */;
-			buildPhases = (
-			);
-			dependencies = (
-				405DD1C2063CD5B500F579EE /* PBXTargetDependency */,
-				405DD1C6063CD5B500F579EE /* PBXTargetDependency */,
-			);
-			name = "Build All";
-			productName = "Build All";
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		1842CAFB085664390032BCF7 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF7085664390032BCF7 /* AGL.framework */; };
-		1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF8085664390032BCF7 /* IOKit.framework */; };
-		1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; };
-		1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; };
-		1842CAFF085664390032BCF7 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF7085664390032BCF7 /* AGL.framework */; };
-		1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF8085664390032BCF7 /* IOKit.framework */; };
-		1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; };
-		1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; };
-		403608C909953BFD00700A19 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; };
-		403E7B8B0CFC0C8F0098D2DB /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */; };
-		403E7B8C0CFC0C900098D2DB /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */; };
-		407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017230A3067FE00AC9076 /* libwx_mac.dylib */; };
-		4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; };
-		4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; };
-		4086D105063BBC5C00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; };
-		4086D107063BBC5C00D4CD53 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; };
-		4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; };
-		409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 409F039A0977B96200D1030F /* libwx_mac_static.a */; };
-		40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; };
-		40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		405DD1C1063CD5B500F579EE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D0E2063BBC5B00D4CD53;
-			remoteInfo = StaticDebug;
-		};
-		405DD1C5063CD5B500F579EE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 4086D102063BBC5C00D4CD53;
-			remoteInfo = DynamicDebug;
-		};
-		409F03990977B96200D1030F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 4086C8CB063AB30000D4CD53;
-			remoteInfo = static;
-		};
-		40F017220A3067FE00AC9076 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 4086CBE1063AB30000D4CD53;
-			remoteInfo = dynamic;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		40A03F7108653C5C000E0339 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1842CAF7085664390032BCF7 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		1842CAF8085664390032BCF7 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		1842CAF9085664390032BCF7 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		1842CAFA085664390032BCF7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
-		1864B4F208566CAB00E32E9B /* minimalDynamic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimalDynamic.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		1864B4F408566CAB00E32E9B /* minimal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-		409F03930977B96200D1030F /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = ../../src/wxWindows.xcodeproj; sourceTree = SOURCE_ROOT; };
-		40F017460A306CAD00AC9076 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		CA60173504D423C000000080 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
-		F591E05701FCC5DE01000133 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = SOURCE_ROOT; };
-		F5F5A69A02CDB0E101000133 /* wxmac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wxmac.icns; path = ../../src/mac/wxmac.icns; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		4086D0E8063BBC5B00D4CD53 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */,
-				4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */,
-				4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */,
-				1842CAFB085664390032BCF7 /* AGL.framework in Frameworks */,
-				1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */,
-				1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */,
-				1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */,
-				40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */,
-				403E7B8B0CFC0C8F0098D2DB /* QuickTime.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D108063BBC5C00D4CD53 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */,
-				4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */,
-				4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */,
-				1842CAFF085664390032BCF7 /* AGL.framework in Frameworks */,
-				1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */,
-				1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */,
-				1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */,
-				40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */,
-				403E7B8C0CFC0C900098D2DB /* QuickTime.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		1864B4F608566CB300E32E9B /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1864B4F208566CAB00E32E9B /* minimalDynamic.app */,
-				1864B4F408566CAB00E32E9B /* minimal.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME¬ª */ = {
-			isa = PBXGroup;
-			children = (
-				409F03930977B96200D1030F /* wxWindows.xcodeproj */,
-				20286C2AFDCF999611CA2CEA /* Sources */,
-				20286C2CFDCF999611CA2CEA /* Resources */,
-				20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */,
-				1864B4F608566CB300E32E9B /* Products */,
-			);
-			name = "¬´PROJECTNAME¬ª";
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				F591E05701FCC5DE01000133 /* minimal.cpp */,
-			);
-			name = Sources;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				F5F5A69A02CDB0E101000133 /* wxmac.icns */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */,
-				40F017460A306CAD00AC9076 /* AppKit.framework */,
-				20286C33FDCF999611CA2CEA /* Carbon.framework */,
-				CA60173504D423C000000080 /* System.framework */,
-				1842CAF7085664390032BCF7 /* AGL.framework */,
-				1842CAF8085664390032BCF7 /* IOKit.framework */,
-				1842CAF9085664390032BCF7 /* OpenGL.framework */,
-				1842CAFA085664390032BCF7 /* WebKit.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		409F03940977B96200D1030F /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				409F039A0977B96200D1030F /* libwx_mac_static.a */,
-				40F017230A3067FE00AC9076 /* libwx_mac.dylib */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		4086D0E3063BBC5B00D4CD53 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D103063BBC5C00D4CD53 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		4086D0E2063BBC5B00D4CD53 /* static */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1842CAA008565A280032BCF7 /* Build configuration list for PBXNativeTarget "static" */;
-			buildPhases = (
-				4086D0E3063BBC5B00D4CD53 /* Headers */,
-				4086D0E4063BBC5B00D4CD53 /* Resources */,
-				4086D0E6063BBC5B00D4CD53 /* Sources */,
-				4086D0E8063BBC5B00D4CD53 /* Frameworks */,
-				4086D0ED063BBC5B00D4CD53 /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = static;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalStaticDebug;
-			productReference = 1864B4F408566CAB00E32E9B /* minimal.app */;
-			productType = "com.apple.product-type.application";
-		};
-		4086D102063BBC5C00D4CD53 /* dynamic */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1842CAA808565A280032BCF7 /* Build configuration list for PBXNativeTarget "dynamic" */;
-			buildPhases = (
-				4086D103063BBC5C00D4CD53 /* Headers */,
-				4086D104063BBC5C00D4CD53 /* Resources */,
-				4086D106063BBC5C00D4CD53 /* Sources */,
-				4086D108063BBC5C00D4CD53 /* Frameworks */,
-				4086D10D063BBC5C00D4CD53 /* Rez */,
-				40A03F7108653C5C000E0339 /* CopyFiles */,
-				40A0CE7F0875719100810086 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = dynamic;
-			productInstallPath = "$(HOME)/Applications";
-			productName = minimalDynamicDebug;
-			productReference = 1864B4F208566CAB00E32E9B /* minimalDynamic.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		20286C28FDCF999611CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1842CAB408565A280032BCF7 /* Build configuration list for PBXProject "minimal" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME¬ª */;
-			productRefGroup = 20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME¬ª */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 409F03940977B96200D1030F /* Products */;
-					ProjectRef = 409F03930977B96200D1030F /* wxWindows.xcodeproj */;
-				},
-			);
-			targets = (
-				4086D0E2063BBC5B00D4CD53 /* static */,
-				4086D102063BBC5C00D4CD53 /* dynamic */,
-				405DD1B0063CD57F00F579EE /* Build All */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		409F039A0977B96200D1030F /* libwx_mac_static.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libwx_mac_static.a;
-			remoteRef = 409F03990977B96200D1030F /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		40F017230A3067FE00AC9076 /* libwx_mac.dylib */ = {
-			isa = PBXReferenceProxy;
-			fileType = "compiled.mach-o.dylib";
-			path = libwx_mac.dylib;
-			remoteRef = 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		4086D0E4063BBC5B00D4CD53 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D104063BBC5C00D4CD53 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4086D105063BBC5C00D4CD53 /* wxmac.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		4086D0ED063BBC5B00D4CD53 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D10D063BBC5C00D4CD53 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		40A0CE7F0875719100810086 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "mkdir $TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH\ncp ../../src/build/$BUILD_STYLE/libwx_mac.dylib $TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		4086D0E6063BBC5B00D4CD53 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				403608C909953BFD00700A19 /* minimal.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4086D106063BBC5C00D4CD53 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4086D107063BBC5C00D4CD53 /* minimal.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		405DD1C2063CD5B500F579EE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 4086D0E2063BBC5B00D4CD53 /* static */;
-			targetProxy = 405DD1C1063CD5B500F579EE /* PBXContainerItemProxy */;
-		};
-		405DD1C6063CD5B500F579EE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 4086D102063BBC5C00D4CD53 /* dynamic */;
-			targetProxy = 405DD1C5063CD5B500F579EE /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		1842CAA108565A280032BCF7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NO_GCC_PRAGMA,
-					__WXMAC__,
-					"wxUSE_BASE=1",
-					"_FILE_OFFSET_BITS=64",
-					_LARGE_FILES,
-					"__WXMAC_XCODE__=1",
-					"WX_PRECOMP=1",
-					MACOS_CLASSIC,
-					"__WXDEBUG__=1",
-				);
-				INFOPLIST_FILE = ../Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Development";
-				OTHER_LDFLAGS = (
-					"-liconv",
-					"-lz",
-				);
-				UNSTRIPPED_PRODUCT = "<Multiple values>";
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
-				USE_SEPARATE_HEADERMAPS = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		1842CAA208565A280032BCF7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NO_GCC_PRAGMA,
-					__WXMAC__,
-					"wxUSE_BASE=1",
-					"_FILE_OFFSET_BITS=64",
-					_LARGE_FILES,
-					"__WXMAC_XCODE__=1",
-					"WX_PRECOMP=1",
-					MACOS_CLASSIC,
-				);
-				INFOPLIST_FILE = ../Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Deployment";
-				OTHER_LDFLAGS = (
-					"-liconv",
-					"-lz",
-				);
-				UNSTRIPPED_PRODUCT = "<Multiple values>";
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
-				USE_SEPARATE_HEADERMAPS = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
-		1842CAA908565A280032BCF7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NO_GCC_PRAGMA,
-					"wxUSE_BASE=1",
-					"__WXDEBUG__=1",
-					MACOS_CLASSIC,
-					WXUSINGDLL,
-					__WXMAC__,
-					"_FILE_OFFSET_BITS=64",
-					_LARGE_FILES,
-					"__WXMAC_XCODE__=1",
-					"WX_PRECOMP=1",
-				);
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCROOT)/../../src/build/Development",
-					"$(SRCROOT)/../../src/build/Deployment",
-				);
-				OTHER_LDFLAGS = (
-					"-liconv",
-					"-lz",
-				);
-				PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic";
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
-				USE_SEPARATE_HEADERMAPS = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = NO;
-				wxDylib = ../../src/build/Development/libwx_macd.dylib;
-			};
-			name = Development;
-		};
-		1842CAAA08565A280032BCF7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NO_GCC_PRAGMA,
-					"wxUSE_BASE=1",
-					WXUSINGDLL,
-					__WXMAC__,
-					"_FILE_OFFSET_BITS=64",
-					_LARGE_FILES,
-					"__WXMAC_XCODE__=1",
-					"WX_PRECOMP=1",
-					MACOS_CLASSIC,
-				);
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCROOT)/../../src/build/Deployment",
-					"$(SRCROOT)/../../src/build/Development",
-				);
-				OTHER_LDFLAGS = (
-					"-liconv",
-					"-lz",
-				);
-				PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic";
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
-				USE_SEPARATE_HEADERMAPS = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = NO;
-				wxDylib = ../../src/build/Deployment/libwx_mac.dylib;
-			};
-			name = Deployment;
-		};
-		1842CAB108565A280032BCF7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Build All";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		1842CAB208565A280032BCF7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Build All";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		1842CAB508565A280032BCF7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = __WXDEBUG__;
-				GCC_VERSION_i386 = 4.0;
-				GCC_VERSION_ppc = 4.0;
-				INFOPLIST_FILE = ../Info.plist;
-				LIBRARY_SEARCH_PATHS = ../../src/;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
-				PRODUCT_NAME = minimal;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		1842CAB608565A280032BCF7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				COPY_PHASE_STRIP = YES;
-				DynamicLibName = libwx_mac.dylib;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_VERSION_i386 = 4.0;
-				GCC_VERSION_ppc = 4.0;
-				INFOPLIST_FILE = ../Info.plist;
-				LIBRARY_SEARCH_PATHS = ../../src/build/Deployment;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
-				PRODUCT_NAME = minimal;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1842CAA008565A280032BCF7 /* Build configuration list for PBXNativeTarget "static" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1842CAA108565A280032BCF7 /* Development */,
-				1842CAA208565A280032BCF7 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		1842CAA808565A280032BCF7 /* Build configuration list for PBXNativeTarget "dynamic" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1842CAA908565A280032BCF7 /* Development */,
-				1842CAAA08565A280032BCF7 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		1842CAB008565A280032BCF7 /* Build configuration list for PBXAggregateTarget "Build All" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1842CAB108565A280032BCF7 /* Development */,
-				1842CAB208565A280032BCF7 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		1842CAB408565A280032BCF7 /* Build configuration list for PBXProject "minimal" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1842CAB508565A280032BCF7 /* Development */,
-				1842CAB608565A280032BCF7 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 20286C28FDCF999611CA2CEA /* Project object */;
-}
--- a/samples/minimal/minimalW7.xml
+++ b/samples/minimal/minimalW7.xml
--- a/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj
@@ -0,0 +1,345 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		405B1A9910EF228C00676938 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; };
+		405B1AC310EF253300676938 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; };
+		40E3518B10EF314A0029DC34 /* libwx_osx_carbon_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */; };
+		40E3518C10EF31550029DC34 /* libwx_osx_carbon.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */; };
+		40E3519010EF320E0029DC34 /* libwx_osx_carbon.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		40E3518110EF30F90029DC34 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D2AAC0C705546C1D00DB518D;
+			remoteInfo = dynamic;
+		};
+		40E3518310EF30F90029DC34 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 404BEE6110EC83280080E2B8;
+			remoteInfo = static;
+		};
+		40E3518710EF31300029DC34 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 363401F972C53D8EBD3D4BD9;
+			remoteInfo = dynamic;
+		};
+		40E3518910EF313A0029DC34 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = BAB02EC06578349A9171CCAC;
+			remoteInfo = static;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		405B1A9410EF209B00676938 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				40E3519010EF320E0029DC34 /* libwx_osx_carbon.dylib in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		405B1A9810EF228C00676938 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
+		405B1ACB10EF253300676938 /* minimal_carbon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_carbon.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		4073593F1370888D0077DE1B /* Info_carbon.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_carbon.plist; sourceTree = "<group>"; };
+		40A9683713B281D700B0D0DD /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
+		40A9683813B281D700B0D0DD /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
+		40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxcarbon.xcodeproj; path = ../../build/osx/wxcarbon.xcodeproj; sourceTree = SOURCE_ROOT; };
+		40E3518610EF31130029DC34 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcarbon.xcconfig; path = ../../build/osx/wxcarbon.xcconfig; sourceTree = SOURCE_ROOT; };
+		8D1107320486CEB800E47090 /* minimal_carbon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_carbon.app; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		405B1AC410EF253300676938 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40E3518B10EF314A0029DC34 /* libwx_osx_carbon_static.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40E3518C10EF31550029DC34 /* libwx_osx_carbon.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* minimal_carbon.app */,
+				405B1ACB10EF253300676938 /* minimal_carbon.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* minimal_cocoa */ = {
+			isa = PBXGroup;
+			children = (
+				4073593F1370888D0077DE1B /* Info_carbon.plist */,
+				40E3518610EF31130029DC34 /* wxcarbon.xcconfig */,
+				40A9683713B281D700B0D0DD /* wxdebug.xcconfig */,
+				40A9683813B281D700B0D0DD /* wxrelease.xcconfig */,
+				40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */,
+				405B1A9710EF227D00676938 /* src */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = minimal_cocoa;
+			sourceTree = "<group>";
+		};
+		405B1A9710EF227D00676938 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				405B1A9810EF228C00676938 /* minimal.cpp */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+		40E3517D10EF30F90029DC34 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */,
+				40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		405B1ABF10EF253300676938 /* static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */;
+			buildPhases = (
+				405B1AC210EF253300676938 /* Sources */,
+				405B1AC410EF253300676938 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40E3518A10EF313A0029DC34 /* PBXTargetDependency */,
+			);
+			name = static;
+			productInstallPath = "$(HOME)/Applications";
+			productName = minimal_cocoa;
+			productReference = 405B1ACB10EF253300676938 /* minimal_carbon.app */;
+			productType = "com.apple.product-type.application";
+		};
+		8D1107260486CEB800E47090 /* dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */;
+			buildPhases = (
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				405B1A9410EF209B00676938 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40E3518810EF31300029DC34 /* PBXTargetDependency */,
+			);
+			name = dynamic;
+			productInstallPath = "$(HOME)/Applications";
+			productName = minimal_cocoa;
+			productReference = 8D1107320486CEB800E47090 /* minimal_carbon.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_carbon" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 29B97314FDCFA39411CA2CEA /* minimal_cocoa */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 40E3517D10EF30F90029DC34 /* Products */;
+					ProjectRef = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* dynamic */,
+				405B1ABF10EF253300676938 /* static */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.dylib";
+			path = libwx_osx_carbon.dylib;
+			remoteRef = 40E3518110EF30F90029DC34 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libwx_osx_carbon_static.a;
+			remoteRef = 40E3518310EF30F90029DC34 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXSourcesBuildPhase section */
+		405B1AC210EF253300676938 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				405B1AC310EF253300676938 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				405B1A9910EF228C00676938 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		40E3518810EF31300029DC34 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = dynamic;
+			targetProxy = 40E3518710EF31300029DC34 /* PBXContainerItemProxy */;
+		};
+		40E3518A10EF313A0029DC34 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = static;
+			targetProxy = 40E3518910EF313A0029DC34 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		405B1AC910EF253300676938 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"$(OTHER_LDFLAGS)",
+					"-lz",
+				);
+				PRODUCT_NAME = minimal_carbon;
+			};
+			name = Debug;
+		};
+		405B1ACA10EF253300676938 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"$(OTHER_LDFLAGS)",
+					"-lz",
+				);
+				PRODUCT_NAME = minimal_carbon;
+			};
+			name = Release;
+		};
+		C01FCF4B08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_carbon;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Debug;
+		};
+		C01FCF4C08A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_carbon;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40A9683713B281D700B0D0DD /* wxdebug.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = Info_carbon.plist;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = Info_carbon.plist;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				405B1AC910EF253300676938 /* Debug */,
+				405B1ACA10EF253300676938 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Debug */,
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_carbon" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj
@@ -0,0 +1,347 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		405B1AE010EF25D200676938 /* libwx_osx_cocoa_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */; };
+		407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; };
+		407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; };
+		40AC73361325727300982A5C /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; };
+		40AC73371325728400982A5C /* libwx_osx_cocoa.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		405B1A8910EF202100676938 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D2AAC0C705546C1D00DB518D;
+			remoteInfo = dynamic;
+		};
+		405B1A8B10EF202100676938 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 404BEE6110EC83280080E2B8;
+			remoteInfo = static;
+		};
+		405B1A9010EF207D00676938 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 363401F972C53D8EBD3D4BD9;
+			remoteInfo = dynamic;
+		};
+		405B1ADD10EF25B100676938 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = BAB02EC06578349A9171CCAC;
+			remoteInfo = static;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		405B1A9410EF209B00676938 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				40AC73371325728400982A5C /* libwx_osx_cocoa.dylib in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		405B1A8410EF202100676938 /* wxcocoa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxcocoa.xcodeproj; path = ../../build/osx/wxcocoa.xcodeproj; sourceTree = SOURCE_ROOT; };
+		405B1ACB10EF253300676938 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		40735927137088070077DE1B /* Info_cocoa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_cocoa.plist; sourceTree = "<group>"; };
+		407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = ../../build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; };
+		407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
+		407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
+		407A75B313B0FE67006BC2D5 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
+		8D1107320486CEB800E47090 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		405B1AC410EF253300676938 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				405B1AE010EF25D200676938 /* libwx_osx_cocoa_static.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40AC73361325727300982A5C /* libwx_osx_cocoa.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* minimal_cocoa.app */,
+				405B1ACB10EF253300676938 /* minimal_cocoa.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* minimal_cocoa */ = {
+			isa = PBXGroup;
+			children = (
+				407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */,
+				407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */,
+				407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */,
+				40735927137088070077DE1B /* Info_cocoa.plist */,
+				405B1A8410EF202100676938 /* wxcocoa.xcodeproj */,
+				405B1A9710EF227D00676938 /* src */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = minimal_cocoa;
+			sourceTree = "<group>";
+		};
+		405B1A8510EF202100676938 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */,
+				405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		405B1A9710EF227D00676938 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				407A75B313B0FE67006BC2D5 /* minimal.cpp */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		405B1ABF10EF253300676938 /* static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */;
+			buildPhases = (
+				405B1AC210EF253300676938 /* Sources */,
+				405B1AC410EF253300676938 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				405B1ADE10EF25B100676938 /* PBXTargetDependency */,
+			);
+			name = static;
+			productInstallPath = "$(HOME)/Applications";
+			productName = minimal_cocoa;
+			productReference = 405B1ACB10EF253300676938 /* minimal_cocoa.app */;
+			productType = "com.apple.product-type.application";
+		};
+		8D1107260486CEB800E47090 /* dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */;
+			buildPhases = (
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				405B1A9410EF209B00676938 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				405B1A9110EF207D00676938 /* PBXTargetDependency */,
+			);
+			name = dynamic;
+			productInstallPath = "$(HOME)/Applications";
+			productName = minimal_cocoa;
+			productReference = 8D1107320486CEB800E47090 /* minimal_cocoa.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_cocoa" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 29B97314FDCFA39411CA2CEA /* minimal_cocoa */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 405B1A8510EF202100676938 /* Products */;
+					ProjectRef = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* dynamic */,
+				405B1ABF10EF253300676938 /* static */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.dylib";
+			path = libwx_osx_cocoa.dylib;
+			remoteRef = 405B1A8910EF202100676938 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libwx_osx_cocoa_static.a;
+			remoteRef = 405B1A8B10EF202100676938 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXSourcesBuildPhase section */
+		405B1AC210EF253300676938 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		405B1A9110EF207D00676938 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = dynamic;
+			targetProxy = 405B1A9010EF207D00676938 /* PBXContainerItemProxy */;
+		};
+		405B1ADE10EF25B100676938 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = static;
+			targetProxy = 405B1ADD10EF25B100676938 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		405B1AC910EF253300676938 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"$(OTHER_LDFLAGS)",
+					"-lz",
+				);
+				PRODUCT_NAME = minimal_cocoa;
+			};
+			name = Debug;
+		};
+		405B1ACA10EF253300676938 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"$(OTHER_LDFLAGS)",
+					"-lz",
+				);
+				PRODUCT_NAME = minimal_cocoa;
+			};
+			name = Release;
+		};
+		C01FCF4B08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_cocoa;
+				USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include";
+			};
+			name = Debug;
+		};
+		C01FCF4C08A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				PRODUCT_NAME = minimal_cocoa;
+				USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include";
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = Info_cocoa.plist;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = Info_cocoa.plist;
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				405B1AC910EF253300676938 /* Debug */,
+				405B1ACA10EF253300676938 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Debug */,
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_cocoa" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj
@@ -0,0 +1,260 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
+		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
+		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
+		407A98E11370835D00E92356 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A98E01370835D00E92356 /* minimal.cpp */; };
+		407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */; };
+		407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 407EE18912F04CF900D0F171 /* AudioToolbox.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		4074F5E812ED969C00693A3F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B4DEA098A05736AE94F01926;
+			remoteInfo = static;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		1D6058910D05DD3D006BFB54 /* minimal_iphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_iphone.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxiphone.xcodeproj; path = ../../build/osx/wxiPhone.xcodeproj; sourceTree = SOURCE_ROOT; };
+		404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxiphone.xcconfig; path = ../../build/osx/wxiphone.xcconfig; sourceTree = SOURCE_ROOT; };
+		407A98E01370835D00E92356 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
+		407A98FA137084FB00E92356 /* Info_iphone.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_iphone.plist; sourceTree = "<group>"; };
+		407EE18912F04CF900D0F171 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
+		409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
+				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
+				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
+				407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */,
+				407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1D6058910D05DD3D006BFB54 /* minimal_iphone.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
+			isa = PBXGroup;
+			children = (
+				407A98FA137084FB00E92356 /* Info_iphone.plist */,
+				404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */,
+				409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */,
+				409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */,
+				404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */,
+				404BECD110EBDC6F0080E2B8 /* src */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = CustomTemplate;
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
+				1D30AB110D05D00D00671497 /* Foundation.framework */,
+				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
+				407EE18912F04CF900D0F171 /* AudioToolbox.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		404BECC610EBDB420080E2B8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		404BECD110EBDC6F0080E2B8 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				407A98E01370835D00E92356 /* minimal.cpp */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		1D6058900D05DD3D006BFB54 /* static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */;
+			buildPhases = (
+				1D60588D0D05DD3D006BFB54 /* Resources */,
+				1D60588E0D05DD3D006BFB54 /* Sources */,
+				1D60588F0D05DD3D006BFB54 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = static;
+			productName = minimal_iphone;
+			productReference = 1D6058910D05DD3D006BFB54 /* minimal_iphone.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 404BECC610EBDB420080E2B8 /* Products */;
+					ProjectRef = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				1D6058900D05DD3D006BFB54 /* static */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libwx_osx_iphone.a;
+			remoteRef = 4074F5E812ED969C00693A3F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		1D60588D0D05DD3D006BFB54 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		1D60588E0D05DD3D006BFB54 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				407A98E11370835D00E92356 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		1D6058940D05DD3E006BFB54 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_iphone;
+			};
+			name = Debug;
+		};
+		1D6058950D05DD3E006BFB54 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_iphone;
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				INFOPLIST_FILE = Info_iphone.plist;
+				PROVISIONING_PROFILE = "";
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				INFOPLIST_FILE = Info_iphone.plist;
+				PROVISIONING_PROFILE = "";
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1D6058940D05DD3E006BFB54 /* Debug */,
+				1D6058950D05DD3E006BFB54 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -57,7 +57,7 @@ bool MyApp::OnInit()
        return false;

    // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"));
+    new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"));

    return true;
 }
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -223,7 +223,7 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
 void TestGLCanvas::LoadDXF(const wxString& filename)
 {
    wxFileInputStream stream(filename);
-    if (stream.Ok())
+    if (stream.IsOk())
 #if wxUSE_ZLIB
    {
        if (filename.Right(3).Lower() == wxT(".gz"))
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -410,7 +410,7 @@ void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
    wxPreviewFrame *frame =
        new wxPreviewFrame(preview, this, wxT("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650));
    frame->Centre(wxBOTH);
-    frame->Initialize(m_previewModality);
+    frame->InitializeWithModality(m_previewModality);
    frame->Show();
 }

--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -711,7 +711,7 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
    if ( name == wxT("Font") )
    {
        wxFont font = wxANY_AS(value, wxFont);
-        wxASSERT( font.Ok() );
+        wxASSERT( font.IsOk() );

        m_pPropGridManager->SetFont( font );
    }
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -60,7 +60,7 @@ wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& n

    // Fix value.
    fontData.SetChosenFont(value.GetInitialFont());
-    if ( !fontData.GetColour().Ok() )
+    if ( !fontData.GetColour().IsOk() )
        fontData.SetColour(*wxBLACK);

    // Set initial value - should be done in a simpler way like this
@@ -113,7 +113,7 @@ void wxFontDataProperty::OnSetValue()
        fontData << m_value_wxFontData;

        wxFont font = fontData.GetChosenFont();
-        if ( !font.Ok() )
+        if ( !font.IsOk() )
            font = wxFont(10,wxSWISS,wxNORMAL,wxNORMAL);

        m_value = WXVARIANT(font);
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -88,12 +88,14 @@ public:
        return wxColour();
    }

-    virtual wxString ColourToString( const wxColour& col, int index ) const
+    virtual wxString ColourToString( const wxColour& col,
+                                     int index,
+                                     int argFlags = 0 ) const
    {
        if ( index == (int)(m_choices.GetCount()-1) )
            return wxT("");

-        return wxColourProperty::ColourToString(col, index);
+        return wxColourProperty::ColourToString(col, index, argFlags);
    }

    virtual int GetCustomColourIndex() const
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -1248,7 +1248,7 @@ void MyFrame::OnFont(wxCommandEvent& WXUNUSED(event))
        fontData = dialog.GetFontData();
        attr.SetFlags(wxTEXT_ATTR_FONT);
        attr.SetFont(fontData.GetChosenFont());
-        if (attr.GetFont().Ok())
+        if (attr.GetFont().IsOk())
        {
            m_richTextCtrl->SetStyle(range, attr);
        }
@@ -1589,7 +1589,7 @@ void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
    m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr);

    wxString currentFontName;
-    if (attr.HasFont() && attr.GetFont().Ok())
+    if (attr.HasFont() && attr.GetFont().IsOk())
        currentFontName = attr.GetFont().GetFaceName();

    // Don't set the initial font in the dialog (so the user is choosing
--- a/samples/sockets/baseserver.cpp
+++ b/samples/sockets/baseserver.cpp
@@ -315,7 +315,7 @@ bool Server::OnInit()
    m_listeningSocket->SetEventHandler(*this);
    m_listeningSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
    m_listeningSocket->Notify(true);
-    if (!m_listeningSocket->Ok())
+    if (!m_listeningSocket->IsOk())
    {
        wxLogError("Cannot bind listening socket");
        return false;
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -217,8 +217,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
  // Create the socket
  m_server = new wxSocketServer(addr);

-  // We use Ok() here to see if the server is really listening
-  if (! m_server->Ok())
+  // We use IsOk() here to see if the server is really listening
+  if (! m_server->IsOk())
  {
    wxLogMessage("Could not listen at the specified port !");
    return;
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -137,7 +137,7 @@ bool MyApp::OnInit()
        bitmap = wxBitmap(mobile_xpm);

    bool ok = frame->m_isPda
-            ? bitmap.Ok()
+            ? bitmap.IsOk()
            : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);

    if (ok)
@@ -218,7 +218,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    if (m_isPda) bitmap = wxBitmap(mobile_xpm);

    bool ok = m_isPda
-            ? bitmap.Ok()
+            ? bitmap.IsOk()
            : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);

    if (ok)
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -430,7 +430,7 @@ void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) {
        new wxPrintPreview (new EditPrint (m_edit),
                            new EditPrint (m_edit),
                            &printDialogData);
-    if (!preview->Ok()) {
+    if (!preview->IsOk()) {
        delete preview;
        wxMessageBox (_("There was a problem with previewing.\n\
                         Perhaps your current printer is not correctly?"),
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -733,10 +733,27 @@ static wxString GetMouseEventDesc(const wxMouseEvent& ev)
        dbl = ev.RightDClick();
        up = ev.RightUp();
    }
+    else if ( ev.Aux1Down() || ev.Aux1Up() || ev.Aux1DClick() )
+    {
+        button = wxT("Aux1");
+        dbl = ev.Aux1DClick();
+        up = ev.Aux1Up();
+    }
+    else if ( ev.Aux2Down() || ev.Aux2Up() || ev.Aux2DClick() )
+    {
+        button = wxT("Aux2");
+        dbl = ev.Aux2DClick();
+        up = ev.Aux2Up();
+    }
+    else if ( ev.GetWheelRotation() )
+    {
+        return wxString::Format("Wheel rotation %+d", ev.GetWheelRotation());
+    }
    else
    {
        return wxT("Unknown mouse event");
    }
+    wxASSERT(!(dbl && up));

    return wxString::Format(wxT("%s mouse button %s"),
                            button.c_str(),
@@ -780,6 +797,8 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
            << GetChar( ev.LeftIsDown(), wxT('1') )
            << GetChar( ev.MiddleIsDown(), wxT('2') )
            << GetChar( ev.RightIsDown(), wxT('3') )
+            << GetChar( ev.Aux1IsDown(), wxT('x') )
+            << GetChar( ev.Aux2IsDown(), wxT('X') )
            << GetChar( ev.ControlDown(), wxT('C') )
            << GetChar( ev.AltDown(), wxT('A') )
            << GetChar( ev.ShiftDown(), wxT('S') )
@@ -1848,7 +1867,7 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
        {
            wxString msg;
            wxString facename(wxT("unknown"));
-            if (attr.GetFont().Ok())
+            if (attr.GetFont().IsOk())
            {
                facename = attr.GetFont().GetFaceName();
            }
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -969,7 +969,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
    if ( TestDestroy() )
        return NULL;

-    wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+    wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );

    event.SetInt( 50 );
    wxQueueEvent( m_frame, event.Clone() );
@@ -984,7 +984,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
            break;

        // create any type of command event here
-        wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+        wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );
        event.SetInt( m_count );

        // send in a thread-safe way
@@ -993,7 +993,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
        wxMilliSleep(200);
    }

-    wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+    wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );
    event.SetInt(-1); // that's all
    wxQueueEvent( m_frame, event.Clone() );
 #endif
@@ -1043,7 +1043,7 @@ wxThread::ExitCode MyGUIThread::Entry()
        wxMutexGuiLeave();

        // notify the dialog that another piece of our masterpiece is complete:
-        wxThreadEvent event( wxEVT_COMMAND_THREAD, GUITHREAD_EVENT );
+        wxThreadEvent event( wxEVT_THREAD, GUITHREAD_EVENT );
        event.SetInt(i+1);
        wxQueueEvent( m_dlg, event.Clone() );

--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -494,7 +494,7 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
    {
        // create a tool with a custom bitmap for testing
        wxImage img(m_pathBmp);
-        if ( img.Ok() )
+        if ( img.IsOk() )
        {
            if ( img.GetWidth() > w && img.GetHeight() > h )
                img = img.GetSubImage(wxRect(0, 0, w, h));
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -901,14 +901,14 @@ void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event))
 {
    wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour());
-    if ( col.Ok() )
+    if ( col.IsOk() )
        m_treeCtrl->SetForegroundColour(col);
 }

 void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event))
 {
    wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour());
-    if ( col.Ok() )
+    if ( col.IsOk() )
        m_treeCtrl->SetBackgroundColour(col);
 }

--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -712,10 +712,10 @@ void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag
 #if wxUSE_IMAGE
            wxASSERT(fn.FileExists());
            wxImage image(fn.GetFullPath());
-            wxASSERT(image.Ok());
+            wxASSERT(image.IsOk());
            RescaleImage(image, foundSize.x, foundSize.y);
            wxBitmap bmp(image);
-            wxASSERT( bmp.Ok() );
+            wxASSERT( bmp.IsOk() );
 #else
            wxBitmap bmp(wxNullBitmap);
 #endif
@@ -842,7 +842,7 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& filepath)
    }

    wxImage image(filepath);
-    if ( image.Ok() )
+    if ( image.IsOk() )
    {
        // Rescale very large images
        int ow = image.GetWidth();
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -134,7 +134,8 @@ protected:
 #if wxUSE_MARKUP
               *m_chkUseMarkup,
 #endif // wxUSE_MARKUP
-               *m_chkDefault;
+               *m_chkDefault,
+               *m_chkUseBitmapClass;

    // more checkboxes for wxBitmapButton only
    wxCheckBox *m_chkUsePressed,
@@ -216,6 +217,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
    m_chkUseMarkup =
 #endif // wxUSE_MARKUP
    m_chkDefault =
+    m_chkUseBitmapClass =
    m_chkUsePressed =
    m_chkUseFocused =
    m_chkUseCurrent =
@@ -252,6 +254,10 @@ void ButtonWidgetsPage::CreateContent()
 #endif // wxUSE_MARKUP
    m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Default"));

+    m_chkUseBitmapClass = CreateCheckBoxAndAddToSizer(sizerLeft,
+        "Use wxBitmapButton");
+    m_chkUseBitmapClass->SetValue(true);
+
    sizerLeft->AddSpacer(5);

    wxSizer *sizerUseLabels =
@@ -363,6 +369,7 @@ void ButtonWidgetsPage::Reset()
 #if wxUSE_MARKUP
    m_chkUseMarkup->SetValue(false);
 #endif // wxUSE_MARKUP
+    m_chkUseBitmapClass->SetValue(true);

    m_chkUsePressed->SetValue(true);
    m_chkUseFocused->SetValue(true);
@@ -449,8 +456,17 @@ void ButtonWidgetsPage::CreateButton()
    {
        showsBitmap = true;

-        wxBitmapButton *bbtn = new wxBitmapButton(this, ButtonPage_Button,
-                                                  CreateBitmap(wxT("normal")));
+        wxButton *bbtn;
+        if ( m_chkUseBitmapClass->GetValue() )
+        {
+          bbtn = new wxBitmapButton(this, ButtonPage_Button,
+                                    CreateBitmap(wxT("normal")));
+        }
+        else
+        {
+          bbtn = new wxButton(this, ButtonPage_Button);
+          bbtn->SetBitmapLabel(CreateBitmap(wxT("normal")));
+        }
        if ( m_chkUsePressed->GetValue() )
            bbtn->SetBitmapPressed(CreateBitmap(wxT("pushed")));
        if ( m_chkUseFocused->GetValue() )
@@ -510,6 +526,8 @@ void ButtonWidgetsPage::CreateButton()
            m_button->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON));
    }

+    m_chkUseBitmapClass->Enable(showsBitmap);
+
    m_chkUsePressed->Enable(showsBitmap);
    m_chkUseFocused->Enable(showsBitmap);
    m_chkUseCurrent->Enable(showsBitmap);
--- a/samples/widgets/hyperlnk.cpp
+++ b/samples/widgets/hyperlnk.cpp
@@ -93,6 +93,7 @@ protected:

    void OnButtonReset(wxCommandEvent& event);
    void OnAlignment(wxCommandEvent& event);
+    void OnGeneric(wxCommandEvent& event);

    // reset the control parameters
    void Reset();
@@ -105,8 +106,8 @@ protected:
    // ------------

    // the checkbox itself and the sizer it is in
-    wxHyperlinkCtrl *m_hyperlink;
-    wxHyperlinkCtrl *m_hyperlinkLong;
+    wxGenericHyperlinkCtrl *m_hyperlink;
+    wxGenericHyperlinkCtrl *m_hyperlinkLong;

    wxTextCtrl *m_label;
    wxTextCtrl *m_url;
@@ -118,6 +119,7 @@ protected:
    wxTextCtrl *m_textLabel;

    wxRadioBox *m_radioAlignMode;
+    wxCheckBox *m_checkGeneric;

 private:
    DECLARE_EVENT_TABLE()
@@ -134,6 +136,7 @@ BEGIN_EVENT_TABLE(HyperlinkWidgetsPage, WidgetsPage)
    EVT_BUTTON(HyperlinkPage_SetURL, HyperlinkWidgetsPage::OnButtonSetURL)

    EVT_RADIOBOX(wxID_ANY, HyperlinkWidgetsPage::OnAlignment)
+    EVT_CHECKBOX(wxID_ANY, HyperlinkWidgetsPage::OnGeneric)
 END_EVENT_TABLE()

 // ============================================================================
@@ -181,7 +184,9 @@ void HyperlinkWidgetsPage::CreateContent()
                                        // wxHL_DEFAULT_STYLE contains wxHL_ALIGN_CENTRE
    sizerLeft->Add(m_radioAlignMode, 0, wxALL|wxGROW, 5);

-
+    m_checkGeneric = new wxCheckBox(this, wxID_ANY, wxT("Use generic version"),
+                                    wxDefaultPosition, wxDefaultSize);
+    sizerLeft->Add(m_checkGeneric, 0, wxALL|wxGROW, 5);

    // right pane
    wxSizer *szHyperlinkLong = new wxBoxSizer(wxVERTICAL);
@@ -189,10 +194,20 @@ void HyperlinkWidgetsPage::CreateContent()

    m_visit = new wxStaticText(this, wxID_ANY, wxT("Visit "));

-    m_hyperlink = new wxHyperlinkCtrl(this,
-                                      HyperlinkPage_Ctrl,
-                                      wxT("wxWidgets website"),
-                                      wxT("www.wxwidgets.org"));
+    if (m_checkGeneric->IsChecked())
+    {
+        m_hyperlink = new wxGenericHyperlinkCtrl(this,
+                                          HyperlinkPage_Ctrl,
+                                          wxT("wxWidgets website"),
+                                          wxT("www.wxwidgets.org"));
+    }
+    else
+    {
+        m_hyperlink = new wxHyperlinkCtrl(this,
+                                          HyperlinkPage_Ctrl,
+                                          wxT("wxWidgets website"),
+                                          wxT("www.wxwidgets.org"));
+    }

    m_fun = new wxStaticText(this, wxID_ANY, wxT(" for fun!"));

@@ -203,10 +218,20 @@ void HyperlinkWidgetsPage::CreateContent()
    szHyperlink->Add(0, 0, 1, wxCENTRE);
    szHyperlink->SetMinSize(150, 0);

-    m_hyperlinkLong = new wxHyperlinkCtrl(this,
-                                          wxID_ANY,
-                                          wxT("This is a long hyperlink"),
-                                          wxT("www.wxwidgets.org"));
+    if (m_checkGeneric->IsChecked())
+    {
+        m_hyperlinkLong = new wxGenericHyperlinkCtrl(this,
+                                              wxID_ANY,
+                                              wxT("This is a long hyperlink"),
+                                              wxT("www.wxwidgets.org"));
+    }
+    else
+    {
+        m_hyperlinkLong = new wxHyperlinkCtrl(this,
+                                              wxID_ANY,
+                                              wxT("This is a long hyperlink"),
+                                              wxT("www.wxwidgets.org"));
+    }

    szHyperlinkLong->Add(0, 0, 1, wxCENTRE);
    szHyperlinkLong->Add(szHyperlink, 0, wxCENTRE|wxGROW);
@@ -236,10 +261,21 @@ void HyperlinkWidgetsPage::CreateHyperlink()
    const wxString label = m_hyperlink->GetLabel();
    const wxString url = m_hyperlink->GetURL();

-    wxHyperlinkCtrl *hyp = new wxHyperlinkCtrl(this,
-                                               HyperlinkPage_Ctrl,
-                                               label,
-                                               url);
+    wxGenericHyperlinkCtrl *hyp;
+    if (m_checkGeneric->IsChecked())
+    {
+        hyp = new wxGenericHyperlinkCtrl(this,
+                                  HyperlinkPage_Ctrl,
+                                  label,
+                                  url);
+    }
+    else
+    {
+        hyp = new wxHyperlinkCtrl(this,
+                                  HyperlinkPage_Ctrl,
+                                  label,
+                                  url);
+    }

    // update sizer's child window
    GetSizer()->Replace(m_hyperlink, hyp, true);
@@ -255,13 +291,28 @@ void HyperlinkWidgetsPage::CreateHyperlink()
 void HyperlinkWidgetsPage::CreateHyperlinkLong(long style)
 {
    style = (wxHL_DEFAULT_STYLE & ~wxHL_ALIGN_CENTRE)|style;
-    wxHyperlinkCtrl *hyp = new wxHyperlinkCtrl(this,
-                                               wxID_ANY,
-                                               wxT("This is a long hyperlink"),
-                                               wxT("www.wxwidgets.org"),
-                                               wxDefaultPosition,
-                                               wxDefaultSize,
-                                               style);
+
+    wxGenericHyperlinkCtrl *hyp;
+    if (m_checkGeneric->IsChecked())
+    {
+        hyp = new wxGenericHyperlinkCtrl(this,
+                                  wxID_ANY,
+                                  wxT("This is a long hyperlink"),
+                                  wxT("www.wxwidgets.org"),
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style);
+    }
+    else
+    {
+        hyp = new wxHyperlinkCtrl(this,
+                                  wxID_ANY,
+                                  wxT("This is a long hyperlink"),
+                                  wxT("www.wxwidgets.org"),
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style);
+    }

    // update sizer's child window
    GetSizer()->Replace(m_hyperlinkLong, hyp, true);
@@ -323,4 +374,10 @@ void HyperlinkWidgetsPage::OnAlignment(wxCommandEvent& WXUNUSED(event))
    CreateHyperlinkLong(addstyle);
 }

+void HyperlinkWidgetsPage::OnGeneric(wxCommandEvent& event)
+{
+    CreateHyperlink();
+    OnAlignment(event);
+}
+
 #endif // wxUSE_HYPERLINKCTRL
--- a/samples/widgets/statbmp.cpp
+++ b/samples/widgets/statbmp.cpp
@@ -122,7 +122,7 @@ void StatBmpWidgetsPage::RecreateWidget()
        return;

    wxImage image(filepath);
-    if (! image.Ok() )
+    if (! image.IsOk() )
    {
        wxLogMessage("Reading image from file '%s' failed.", filepath.c_str());
        return;
--- a/samples/widgets/toggle.cpp
+++ b/samples/widgets/toggle.cpp
@@ -32,11 +32,17 @@

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
-    #include "wx/sizer.h"
+    #include "wx/button.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobox.h"
    #include "wx/statbox.h"
    #include "wx/textctrl.h"
 #endif

+#include "wx/artprov.h"
+#include "wx/sizer.h"
+#include "wx/dcmemory.h"
+
 #include "icons/toggle.xpm"

 // ----------------------------------------------------------------------------
@@ -51,6 +57,29 @@ enum
    TogglePage_Picker
 };

+// radio boxes
+enum
+{
+    ToggleImagePos_Left,
+    ToggleImagePos_Right,
+    ToggleImagePos_Top,
+    ToggleImagePos_Bottom
+};
+
+enum
+{
+    ToggleHAlign_Left,
+    ToggleHAlign_Centre,
+    ToggleHAlign_Right
+};
+
+enum
+{
+    ToggleVAlign_Top,
+    ToggleVAlign_Centre,
+    ToggleVAlign_Bottom
+};
+
 // ----------------------------------------------------------------------------
 // CheckBoxWidgetsPage
 // ----------------------------------------------------------------------------
@@ -68,6 +97,9 @@ public:
    virtual void CreateContent();

 protected:
+    // event handlers
+    void OnCheckOrRadioBox(wxCommandEvent& event);
+
    // event handlers
    void OnButtonReset(wxCommandEvent& event);
    void OnButtonChangeLabel(wxCommandEvent& event);
@@ -78,11 +110,41 @@ protected:
    // (re)create the toggle
    void CreateToggle();

+    // helper function: create a bitmap for wxBitmapToggleButton
+    wxBitmap CreateBitmap(const wxString& label);
+
    // the controls
    // ------------

+#if wxUSE_MARKUP
+    wxCheckBox *m_chkUseMarkup;
+#endif // wxUSE_MARKUP
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    // the check/radio boxes for styles
+    wxCheckBox *m_chkBitmapOnly,
+               *m_chkTextAndBitmap,
+               *m_chkFit,
+               *m_chkUseBitmapClass;
+
+    // more checkboxes for wxBitmapToggleButton only
+    wxCheckBox *m_chkUsePressed,
+               *m_chkUseFocused,
+               *m_chkUseCurrent,
+               *m_chkUseDisabled;
+
+    // and an image position choice used if m_chkTextAndBitmap is on
+    wxRadioBox *m_radioImagePos;
+
+    wxRadioBox *m_radioHAlign,
+               *m_radioVAlign;
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
    // the checkbox itself and the sizer it is in
+#ifdef wxHAS_ANY_BUTTON
    wxToggleButton *m_toggle;
+#else
+    wxToggleButtonBase *m_toggle;
+#endif // wxHAS_ANY_BUTTON
    wxSizer *m_sizerToggle;

    // the text entries for command parameters
@@ -100,6 +162,9 @@ private:
 BEGIN_EVENT_TABLE(ToggleWidgetsPage, WidgetsPage)
    EVT_BUTTON(TogglePage_Reset, ToggleWidgetsPage::OnButtonReset)
    EVT_BUTTON(TogglePage_ChangeLabel, ToggleWidgetsPage::OnButtonChangeLabel)
+
+    EVT_CHECKBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox)
 END_EVENT_TABLE()

 // ============================================================================
@@ -120,6 +185,29 @@ ToggleWidgetsPage::ToggleWidgetsPage(WidgetsBookCtrl *book,
                                     wxImageList *imaglist)
                      :WidgetsPage(book, imaglist, toggle_xpm)
 {
+#if wxUSE_MARKUP
+    m_chkUseMarkup = (wxCheckBox *)NULL;
+#endif // wxUSE_MARKUP
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    // init everything
+    m_chkBitmapOnly =
+    m_chkTextAndBitmap =
+    m_chkFit =
+    m_chkUseBitmapClass =
+    m_chkUsePressed =
+    m_chkUseFocused =
+    m_chkUseCurrent =
+    m_chkUseDisabled = (wxCheckBox *)NULL;
+
+    m_radioImagePos =
+    m_radioHAlign =
+    m_radioVAlign = (wxRadioBox *)NULL;
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
+    m_textLabel = (wxTextCtrl *)NULL;
+
+    m_toggle = (wxToggleButton *)NULL;
+    m_sizerToggle = (wxSizer *)NULL;
 }

 void ToggleWidgetsPage::CreateContent()
@@ -127,9 +215,81 @@ void ToggleWidgetsPage::CreateContent()
    wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);

    // left pane
-//    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("Styles"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("Styles"));

-//    wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
+    wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
+
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    m_chkBitmapOnly = CreateCheckBoxAndAddToSizer(sizerLeft, "&Bitmap only");
+    m_chkTextAndBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, "Text &and bitmap");
+    m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Fit exactly"));
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+#if wxUSE_MARKUP
+    m_chkUseMarkup = CreateCheckBoxAndAddToSizer(sizerLeft, "Interpret &markup");
+#endif // wxUSE_MARKUP
+
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    m_chkUseBitmapClass = CreateCheckBoxAndAddToSizer(sizerLeft,
+        "Use wxBitmapToggleButton");
+    m_chkUseBitmapClass->SetValue(true);
+
+    sizerLeft->AddSpacer(5);
+
+    wxSizer *sizerUseLabels =
+        new wxStaticBoxSizer(wxVERTICAL, this,
+                "&Use the following bitmaps in addition to the normal one?");
+    m_chkUsePressed = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Pressed (small help icon)");
+    m_chkUseFocused = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Focused (small error icon)");
+    m_chkUseCurrent = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Current (small warning icon)");
+    m_chkUseDisabled = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Disabled (broken image icon)");
+    sizerLeft->Add(sizerUseLabels, wxSizerFlags().Expand().Border());
+
+    sizerLeft->AddSpacer(10);
+
+    static const wxString dirs[] =
+    {
+        "left", "right", "top", "bottom",
+    };
+    m_radioImagePos = new wxRadioBox(this, wxID_ANY, "Image &position",
+                                     wxDefaultPosition, wxDefaultSize,
+                                     WXSIZEOF(dirs), dirs);
+    sizerLeft->Add(m_radioImagePos, 0, wxGROW | wxALL, 5);
+    sizerLeft->AddSpacer(15);
+
+    // should be in sync with enums Toggle[HV]Align!
+    static const wxString halign[] =
+    {
+        wxT("left"),
+        wxT("centre"),
+        wxT("right"),
+    };
+
+    static const wxString valign[] =
+    {
+        wxT("top"),
+        wxT("centre"),
+        wxT("bottom"),
+    };
+
+    m_radioHAlign = new wxRadioBox(this, wxID_ANY, wxT("&Horz alignment"),
+                                   wxDefaultPosition, wxDefaultSize,
+                                   WXSIZEOF(halign), halign);
+    m_radioVAlign = new wxRadioBox(this, wxID_ANY, wxT("&Vert alignment"),
+                                   wxDefaultPosition, wxDefaultSize,
+                                   WXSIZEOF(valign), valign);
+
+    sizerLeft->Add(m_radioHAlign, 0, wxGROW | wxALL, 5);
+    sizerLeft->Add(m_radioVAlign, 0, wxGROW | wxALL, 5);
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
+    sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
+
+    wxButton *btn = new wxButton(this, TogglePage_Reset, wxT("&Reset"));
+    sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);

    // middle pane
    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Operations"));
@@ -144,48 +304,184 @@ void ToggleWidgetsPage::CreateContent()
    sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);

    // right pane
-    wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
-
-    m_toggle = new wxToggleButton(this, TogglePage_Picker, wxT("Toggle Button"));
-
-    sizerRight->Add(0, 0, 1, wxCENTRE);
-    sizerRight->Add(m_toggle, 1, wxCENTRE);
-    sizerRight->Add(0, 0, 1, wxCENTRE);
-    sizerRight->SetMinSize(150, 0);
-    m_sizerToggle = sizerRight; // save it to modify it later
+    m_sizerToggle = new wxBoxSizer(wxHORIZONTAL);
+    m_sizerToggle->SetMinSize(150, 0);

    // the 3 panes panes compose the window
-//    sizerTop->Add(sizerLeft, 0, (wxALL & ~wxLEFT), 10);
+    sizerTop->Add(sizerLeft, 0, (wxALL & ~wxLEFT), 10);
    sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);
-    sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
+    sizerTop->Add(m_sizerToggle, 1, wxGROW | (wxALL & ~wxRIGHT), 10);

-    // final initializations
+    // do create the main control
    Reset();
+    CreateToggle();

    SetSizer(sizerTop);
 }

 void ToggleWidgetsPage::Reset()
 {
-    m_toggle->SetValue(false);
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    m_chkBitmapOnly->SetValue(false);
+    m_chkFit->SetValue(true);
+    m_chkTextAndBitmap->SetValue(false);
+#if wxUSE_MARKUP
+    m_chkUseMarkup->SetValue(false);
+#endif // wxUSE_MARKUP
+    m_chkUseBitmapClass->SetValue(true);
+
+    m_chkUsePressed->SetValue(true);
+    m_chkUseFocused->SetValue(true);
+    m_chkUseCurrent->SetValue(true);
+    m_chkUseDisabled->SetValue(true);
+
+    m_radioImagePos->SetSelection(ToggleImagePos_Left);
+    m_radioHAlign->SetSelection(ToggleHAlign_Centre);
+    m_radioVAlign->SetSelection(ToggleVAlign_Centre);
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
+    if ( m_toggle )
+    {
+        m_toggle->SetValue(false);
+    }
 }

 void ToggleWidgetsPage::CreateToggle()
 {
-    const bool value = m_toggle->GetValue();
+    wxString label;
+    bool value = false;

-    size_t count = m_sizerToggle->GetChildren().GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    if ( m_toggle )
    {
-        m_sizerToggle->Remove(0);
+        label = m_toggle->GetLabel();
+        value = m_toggle->GetValue();
+        size_t count = m_sizerToggle->GetChildren().GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_sizerToggle->Remove(0);
+        }
+
+        delete m_toggle;
    }

-    delete m_toggle;
+    if ( label.empty() )
+    {
+        // creating for the first time or recreating a toggle button after bitmap
+        // button
+        label = m_textLabel->GetValue();
+    }

-    m_toggle = new wxToggleButton(this, TogglePage_Picker, wxT("Toggle Button"));
+    int flags = ms_defaultFlags;
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    switch ( m_radioHAlign->GetSelection() )
+    {
+        case ToggleHAlign_Left:
+            flags |= wxBU_LEFT;
+            break;

+        default:
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));
+            // fall through
+
+        case ToggleHAlign_Centre:
+            break;
+
+        case ToggleHAlign_Right:
+            flags |= wxBU_RIGHT;
+            break;
+    }
+
+    switch ( m_radioVAlign->GetSelection() )
+    {
+        case ToggleVAlign_Top:
+            flags |= wxBU_TOP;
+            break;
+
+        default:
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));
+            // fall through
+
+        case ToggleVAlign_Centre:
+            // centre vertical alignment is the default (no style)
+            break;
+
+        case ToggleVAlign_Bottom:
+            flags |= wxBU_BOTTOM;
+            break;
+    }
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+    bool showsBitmap = false;
+    if ( m_chkBitmapOnly->GetValue() )
+    {
+        showsBitmap = true;
+
+        wxToggleButton *btgl;
+        if ( m_chkUseBitmapClass->GetValue() )
+        {
+          btgl = new wxBitmapToggleButton(this, TogglePage_Picker,
+                                          CreateBitmap(wxT("normal")));
+        }
+        else
+        {
+          btgl = new wxToggleButton(this, TogglePage_Picker, wxT(""));
+          btgl->SetBitmapLabel(CreateBitmap(wxT("normal")));
+        }
+#ifdef wxHAS_ANY_BUTTON
+        if ( m_chkUsePressed->GetValue() )
+            btgl->SetBitmapPressed(CreateBitmap(wxT("pushed")));
+        if ( m_chkUseFocused->GetValue() )
+            btgl->SetBitmapFocus(CreateBitmap(wxT("focused")));
+        if ( m_chkUseCurrent->GetValue() )
+            btgl->SetBitmapCurrent(CreateBitmap(wxT("hover")));
+        if ( m_chkUseDisabled->GetValue() )
+            btgl->SetBitmapDisabled(CreateBitmap(wxT("disabled")));
+#endif // wxHAS_ANY_BUTTON
+        m_toggle = btgl;
+    }
+    else // normal button
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+    {
+        m_toggle = new wxToggleButton(this, TogglePage_Picker, label,
+                                      wxDefaultPosition, wxDefaultSize,
+                                      flags);
+    }
    m_toggle->SetValue(value);

+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+#ifdef wxHAS_ANY_BUTTON
+    if ( !showsBitmap && m_chkTextAndBitmap->GetValue() )
+    {
+        showsBitmap = true;
+
+        static const wxDirection positions[] =
+        {
+            wxLEFT, wxRIGHT, wxTOP, wxBOTTOM
+        };
+
+        m_toggle->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_BUTTON),
+                            positions[m_radioImagePos->GetSelection()]);
+
+        if ( m_chkUsePressed->GetValue() )
+            m_toggle->SetBitmapPressed(wxArtProvider::GetIcon(wxART_HELP, wxART_BUTTON));
+        if ( m_chkUseFocused->GetValue() )
+            m_toggle->SetBitmapFocus(wxArtProvider::GetIcon(wxART_ERROR, wxART_BUTTON));
+        if ( m_chkUseCurrent->GetValue() )
+            m_toggle->SetBitmapCurrent(wxArtProvider::GetIcon(wxART_WARNING, wxART_BUTTON));
+        if ( m_chkUseDisabled->GetValue() )
+            m_toggle->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON));
+    }
+#endif // wxHAS_ANY_BUTTON
+
+    m_chkUseBitmapClass->Enable(showsBitmap);
+
+    m_chkUsePressed->Enable(showsBitmap);
+    m_chkUseFocused->Enable(showsBitmap);
+    m_chkUseCurrent->Enable(showsBitmap);
+    m_chkUseDisabled->Enable(showsBitmap);
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
    m_sizerToggle->Add(0, 0, 1, wxCENTRE);
    m_sizerToggle->Add(m_toggle, 1, wxCENTRE);
    m_sizerToggle->Add(0, 0, 1, wxCENTRE);
@@ -203,9 +499,44 @@ void ToggleWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
    CreateToggle();
 }

-void ToggleWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event))
+void ToggleWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
 {
-    m_toggle->SetLabel(m_textLabel->GetValue());
+    CreateToggle();
 }

+void ToggleWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event))
+{
+    const wxString labelText = m_textLabel->GetValue();
+
+#if wxUSE_MARKUP
+    if ( m_chkUseMarkup->GetValue() )
+        m_toggle->SetLabelMarkup(labelText);
+    else
+#endif // wxUSE_MARKUP
+        m_toggle->SetLabel(labelText);
+}
+
+#ifdef wxHAS_BITMAPTOGGLEBUTTON
+// ----------------------------------------------------------------------------
+// bitmap toggle button stuff
+// ----------------------------------------------------------------------------
+
+wxBitmap ToggleWidgetsPage::CreateBitmap(const wxString& label)
+{
+    wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
+    wxMemoryDC dc;
+    dc.SelectObject(bmp);
+    dc.SetBackground(wxBrush(*wxCYAN));
+    dc.Clear();
+    dc.SetTextForeground(*wxBLACK);
+    dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
+                    wxT("(") + label + wxT(" state)"),
+                 wxArtProvider::GetBitmap(wxART_INFORMATION),
+                 wxRect(10, 10, bmp.GetWidth() - 20, bmp.GetHeight() - 20),
+                 wxALIGN_CENTRE);
+
+    return bmp;
+}
+#endif // wxHAS_BITMAPTOGGLEBUTTON
+
 #endif // wxUSE_TOGGLEBTN
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -800,11 +800,11 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
    // allow for debugging the default colour the first time this is called
    WidgetsPage *page = CurrentPage();

-    if (!m_colFg.Ok())
+    if (!m_colFg.IsOk())
        m_colFg = page->GetForegroundColour();

    wxColour col = GetColourFromUser(this, m_colFg);
-    if ( !col.Ok() )
+    if ( !col.IsOk() )
        return;

    m_colFg = col;
@@ -823,11 +823,11 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
    WidgetsPage *page = CurrentPage();

-    if ( !m_colBg.Ok() )
+    if ( !m_colBg.IsOk() )
        m_colBg = page->GetBackgroundColour();

    wxColour col = GetColourFromUser(this, m_colBg);
-    if ( !col.Ok() )
+    if ( !col.IsOk() )
        return;

    m_colBg = col;
@@ -845,7 +845,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 void WidgetsFrame::OnSetPageBg(wxCommandEvent& WXUNUSED(event))
 {
    wxColour col = GetColourFromUser(this, GetBackgroundColour());
-    if ( !col.Ok() )
+    if ( !col.IsOk() )
        return;

    CurrentPage()->SetBackgroundColour(col);
@@ -857,11 +857,11 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_FONTDLG
    WidgetsPage *page = CurrentPage();

-    if (!m_font.Ok())
+    if (!m_font.IsOk())
        m_font = page->GetFont();

    wxFont font = wxGetFontFromUser(this, m_font);
-    if ( !font.Ok() )
+    if ( !font.IsOk() )
        return;

    m_font = font;
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -229,9 +229,9 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
    // XRCCTRL
    wxListCtrl * const list = XRCCTRL(dlg, "controls_listctrl", wxListCtrl);

-    list->InsertItem(0, "Athos");   list->SetItem(0, 1, "90");
-    list->InsertItem(1, "Porthos"); list->SetItem(1, 1, "120");
-    list->InsertItem(2, "Aramis");  list->SetItem(2, 1, "80");
+    list->InsertItem(0, "Athos", 0);   list->SetItem(0, 1, "90", 2);
+    list->InsertItem(1, "Porthos", 5); list->SetItem(1, 1, "120", 3);
+    list->InsertItem(2, "Aramis", 1);  list->SetItem(2, 1, "80", 4);
 #endif // wxUSE_LISTCTRL

 #if wxUSE_TREECTRL
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -511,14 +511,25 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                <object class="wxListCtrl" name="controls_listctrl">
                                    <size>220,160</size>
                                    <style>wxLC_REPORT|wxBORDER_SIMPLE</style>
+                                    <imagelist-small>
+                                        <size>16,16</size>
+                                        <bitmap stock_id="wxART_HELP_BOOK"/>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <bitmap stock_id="wxART_PLUS"/>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <bitmap stock_id="wxART_WARNING"/>
+                                    </imagelist-small>
                                    <object class="listcol">
                                        <text>Name</text>
-                                        <width>150</width>
+                                        <width>105</width>
+                                        <image>0</image>
                                    </object>
                                    <object class="listcol">
                                        <text>Weight</text>
                                        <align>wxLIST_FORMAT_RIGHT</align>
-                                        <width>50</width>
+                                        <width>105</width>
+                                        <image>1</image>
                                    </object>
                                    <!-- the items are added from the code -->
                                </object>
@@ -1136,9 +1147,18 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                <object class="wxTreebook" name="controls_treebook">
                                    <size>350,280</size>
                                    <style>wxSUNKEN_BORDER</style>
+                                    <imagelist>
+                                        <size>16,16</size>
+                                        <bitmap stock_id="wxART_HELP_BOOK"/>
+                                        <bitmap stock_id="wxART_QUESTION"/>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                    </imagelist>
                                    <object class="treebookpage">
                                        <label>Page 1</label>
                                        <depth>0</depth>
+                                        <image>0</image>
+                                        <expanded>1</expanded>
                                        <object class="wxButton" name="controls_treebook_button1">
                                            <size>200,180</size>
                                            <label>Button N1</label>
@@ -1147,10 +1167,13 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                    <object class="treebookpage">
                                        <label>Empty Page 2</label>
                                        <depth>1</depth>
+                                        <image>1</image>
+                                        <expanded>1</expanded>
                                    </object>
                                    <object class="treebookpage">
                                        <label>Page 3</label>
                                        <depth>2</depth>
+                                        <image>2</image>
                                        <object class="wxButton" name="controls_treebook_button3">
                                            <size>200,180</size>
                                            <label>Button N3</label>
@@ -1159,6 +1182,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                    <object class="treebookpage">
                                        <label>Page 4</label>
                                        <depth>1</depth>
+                                        <image>3</image>
                                        <object class="wxButton" name="controls_treebook_button4">
                                            <size>200,180</size>
                                            <label>Button N4</label>