Cosmetic changes to wxSS::GetScreen:

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1f4758bc20cce0c9959f76173aa5e5a3e924e0e8..c5be4c74fa62c813d6786fe626206e4139c178d1 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);
         }


@@ -480,9 +483,35 @@ END_EVENT_TABLE()
 // ============================================================================
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 // ============================================================================
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )

-       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
-         m_text(NULL), m_notebook(NULL)
+       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )

 {
 {

+    m_listbox = NULL;
+    m_listboxSorted = NULL;
+#if wxUSE_CHOICE
+    m_choice = NULL;
+    m_choiceSorted = NULL;
+#endif
+    m_combo = NULL;
+    m_radio = NULL;
+    m_gauge = NULL;
+    m_gaugeVert = NULL;
+    m_slider = NULL;
+    m_fontButton = NULL;
+    m_lbSelectNum = NULL;
+    m_lbSelectThis = NULL;
+#if wxUSE_SPINBTN
+    m_spinbutton = NULL;
+    m_btnProgress = NULL;
+#endif // wxUSE_SPINBTN
+#if wxUSE_SPINCTRL
+    m_spinctrl = NULL;
+#endif // wxUSE_SPINCTRL
+    m_spintext = NULL;
+    m_checkbox = NULL;
+    m_text = NULL;
+    m_notebook = NULL;
+    m_label = NULL;
+

     m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_text->SetBackgroundColour(wxT("wheat"));
     m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_text->SetBackgroundColour(wxT("wheat"));


@@ -703,7 +732,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) );
 #if wxUSE_SPINBTN
     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) );
     m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) );
 #if wxUSE_SPINBTN
     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) );

-    m_spinbutton->SetRange(-10,30);
+    m_spinbutton->SetRange(-40,30);

     m_spinbutton->SetValue(initialSpinValue);
 
     m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",
     m_spinbutton->SetValue(initialSpinValue);
 
     m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",


@@ -721,12 +750,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 +780,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 +842,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 );
 


@@ -1215,6 +1244,8 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 
 void MyPanel::OnSpinCtrl(wxSpinEvent& event)
 {
 
 void MyPanel::OnSpinCtrl(wxSpinEvent& event)
 {

+    if (!m_spinctrl)
+        return ;

     wxString s;
     s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
              m_spinctrl->GetValue(), event.GetInt());
     wxString s;
     s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
              m_spinctrl->GetValue(), event.GetInt());


@@ -1230,7 +1261,7 @@ void MyPanel::OnSpinUp( wxSpinEvent &event )
     value.Printf( _T("Spin control up: current = %d\n"),
                  m_spinbutton->GetValue());
 
     value.Printf( _T("Spin control up: current = %d\n"),
                  m_spinbutton->GetValue());
 

-    if ( m_spinbutton->GetValue() > 17 )
+    if ( event.GetPosition() > 17 )

     {
         value += _T("Preventing the spin button from going above 17.\n");
 
     {
         value += _T("Preventing the spin button from going above 17.\n");
 


@@ -1246,7 +1277,7 @@ void MyPanel::OnSpinDown( wxSpinEvent &event )
     value.Printf( _T("Spin control down: current = %d\n"),
                  m_spinbutton->GetValue());
 
     value.Printf( _T("Spin control down: current = %d\n"),
                  m_spinbutton->GetValue());
 

-    if ( m_spinbutton->GetValue() < -17 )
+    if ( event.GetPosition() < -17 )

     {
         value += _T("Preventing the spin button from going below -17.\n");
 
     {
         value += _T("Preventing the spin button from going below -17.\n");