Added missing CreateManifest() to initialisation

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1f4758bc20cce0c9959f76173aa5e5a3e924e0e8..541e0d5a5eb192a3b48fd0c1c7303b6b5346cb2c 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -29,12 +29,13 @@
 #include "wx/tglbtn.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/tglbtn.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"

+#include "wx/artprov.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)

     #define USE_XPM
 #endif
 
     #define USE_XPM
 #endif
 


@@ -183,10 +184,12 @@ private:
         if ( m_frameStatusBar )
         {
             wxString msg;
         if ( m_frameStatusBar )
         {
             wxString msg;

-            wxSize sizeCl = GetClientSize();
-            msg.Printf(_("pos=(%d, %d), size=%dx%d (client=%dx%d)"),
+            wxSize sizeAll = GetSize(),
+                   sizeCl = GetClientSize();
+            msg.Printf(_("pos=(%d, %d), size=%dx%d or %dx%d (client=%dx%d)"),

                        pos.x, pos.y,
                        size.x, size.y,
                        pos.x, pos.y,
                        size.x, size.y,

+                       sizeAll.x, sizeAll.y,

                        sizeCl.x, sizeCl.y);
             SetStatusText(msg, 1);
         }
                        sizeCl.x, sizeCl.y);
             SetStatusText(msg, 1);
         }


@@ -721,12 +724,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     panel = new wxPanel(m_notebook);
 
 #if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
     panel = new wxPanel(m_notebook);
 
 #if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.

-    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
+    wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);

     wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
                                                    wxPoint(10, 10));
 
     bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
     wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
                                                    wxPoint(10, 10));
 
     bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));

-    bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
+    bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION));

 #endif // !Motif
 
     wxBitmap bitmap( 100, 100 );
 #endif // !Motif
 
     wxBitmap bitmap( 100, 100 );


@@ -751,9 +754,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     }
 #endif
 
     }
 #endif
 

-    wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
-             bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
-             bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));
+    wxBitmap bmp1(wxArtProvider::GetBitmap(wxART_INFORMATION)),
+             bmp2(wxArtProvider::GetBitmap(wxART_WARNING)),
+             bmp3(wxArtProvider::GetBitmap(wxART_QUESTION));

     wxBitmapButton *bmpBtn = new wxBitmapButton
                                  (
                                   panel, -1,
     wxBitmapButton *bmpBtn = new wxBitmapButton
                                  (
                                   panel, -1,


@@ -813,7 +816,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );
     sizer->Add( 20,20, 1 );
 
     sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );
     sizer->Add( 20,20, 1 );

-    sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 );
+    sizer->Add( new wxButton(panel, -1, "Multiline\nbutton" ), 3, wxGROW|wxALL, 10 );

 
     panel->SetSizer( sizer );
 
 
     panel->SetSizer( sizer );