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 17680e7f076c1198cfe14a3faab874e647b694e8..c217cba59729649bb201bd6872fa3ccf9258d472 100644 (file)
--- a/samples/propsize/propsize.cpp
+++ b/samples/propsize/propsize.cpp
@@ -164,9 +164,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetStatusText(_T("Resize the frame to see how controls react"));
 #endif // wxUSE_STATUSBAR
 
     SetStatusText(_T("Resize the frame to see how controls react"));
 #endif // wxUSE_STATUSBAR
 

-#define AddLine(orient) \
-    Add( new wxStaticLine( this, wxID_ANY, 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, wxID_ANY, label, wxDefaultPosition, wxSize(100,50)), \
 
 #define AddButton(label,align) Add( \
     new wxButton( this, wxID_ANY, label, wxDefaultPosition, wxSize(100,50)), \