use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp
index ac01949d32d3416a200ff8537677d91bc5a7144a..c217cba59729649bb201bd6872fa3ccf9258d472 100644 (file)
--- a/samples/propsize/propsize.cpp
+++ b/samples/propsize/propsize.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        propsize.cpp
-// Purpose:     wxWindows propsize sample
+// Purpose:     wxWidgets propsize sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -29,7 +29,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -73,7 +73,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -89,10 +89,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -100,7 +100,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -124,13 +124,13 @@ bool MyApp::OnInit()
 
     // Show it and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?
-    frame->Show(TRUE);
+    frame->Show(true);
     SetTopWindow(frame);
 
     // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the
     // application would exit immediately.
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -139,7 +139,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
     // set the frame icon
     SetIcon(wxICON(mondrian));
@@ -164,12 +164,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetStatusText(_T("Resize the frame to see how controls react"));
 #endif // wxUSE_STATUSBAR
 
-#define AddLine(orient) \
-    Add( new wxStaticLine( this, -1, wxDefaultPosition, wxSize(2,2), orient), \
-    0, wxEXPAND)
+#if wxUSE_STATLINE
+    #define AddLine(orient) \
+        Add( new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(2,2), orient), \
+        0, wxEXPAND)
+#else
+    #define AddLine(orient) \
+        Add( 2, 2)
+#endif // wxUSE_STATLINE
 
 #define AddButton(label,align) Add( \
-    new wxButton( this, -1, label, wxDefaultPosition, wxSize(100,50)), \
+    new wxButton( this, wxID_ANY, label, wxDefaultPosition, wxSize(100,50)), \
     1, wxSHAPED | align)
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
@@ -190,11 +195,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // sizer that preserves it's shape
     wxBoxSizer *vsizer = new wxBoxSizer( wxVERTICAL );
     vsizer->Add(
-        new wxButton( this, -1, _T("up"), wxDefaultPosition, wxSize(100,25) ),
+        new wxButton( this, wxID_ANY, _T("up"), wxDefaultPosition, wxSize(100,25) ),
         1, wxEXPAND);
 
     vsizer->Add(
-        new wxButton( this, -1, _T("down"), wxDefaultPosition, wxSize(100,25) ),
+        new wxButton( this, wxID_ANY, _T("down"), wxDefaultPosition, wxSize(100,25) ),
         1, wxEXPAND);
 
     hsizer2->Add(vsizer, 1, wxSHAPED | wxALIGN_CENTER);
@@ -228,8 +233,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))