fixes for new lib dirs for wxMSW

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index cda93e9e868f18b3dd2c21af6e7d29efe555c3e8..407143684782e8cf1562085eb7f0f2ee94dc2c2e 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -92,7 +92,7 @@ public:
             const wxString& title = _T("wxToolBar Sample"),
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const wxString& title = _T("wxToolBar Sample"),
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxDEFAULT_FRAME_STYLE);
+            long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE);

 
     void RecreateToolbar();
 
 
     void RecreateToolbar();
 


@@ -267,6 +267,7 @@ void MyFrame::RecreateToolbar()
 
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
 
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;

+    style |= wxNO_FULL_REPAINT_ON_RESIZE ;

 
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 #endif
 
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 #endif


@@ -611,7 +612,8 @@ void MyFrame::DoToggleHelp()
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {

-    event.Enable( m_textWindow->CanCopy() );
+    if (m_textWindow)
+        event.Enable( m_textWindow->CanCopy() );

 }
 
 void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))