test for round() using C++ compiler, not C one (should fix IRIX mipsPro build)

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index fcc754ac748ee6cc1c7485a9de5e82e75da2a436..97c563ab968559e2b53db72e63e6e940ef0dc57a 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -84,7 +84,8 @@ protected:
     void OnQuit(wxCommandEvent& event);
 #if USE_LOG_WINDOW
     void OnClearLog(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
 #if USE_LOG_WINDOW
     void OnClearLog(wxCommandEvent& event);

-#endif
+    void OnClearLogUpdateUI(wxUpdateUIEvent& event);
+#endif // USE_LOG_WINDOW

 
     void OnAbout(wxCommandEvent& event);
 
 
     void OnAbout(wxCommandEvent& event);
 


@@ -200,7 +201,7 @@ enum
 {
     Menu_File_Quit = wxID_EXIT,
 #if USE_LOG_WINDOW
 {
     Menu_File_Quit = wxID_EXIT,
 #if USE_LOG_WINDOW

-    Menu_File_ClearLog,
+    Menu_File_ClearLog = 100,

 #endif
 
     Menu_MenuBar_Toggle = 200,
 #endif
 
     Menu_MenuBar_Toggle = 200,


@@ -266,6 +267,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
 #if USE_LOG_WINDOW
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
 #if USE_LOG_WINDOW
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)

+    EVT_UPDATE_UI(Menu_File_ClearLog, MyFrame::OnClearLogUpdateUI)

 #endif
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 #endif
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)


@@ -342,6 +344,9 @@ IMPLEMENT_APP(MyApp)
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
     MyFrame* frame = new MyFrame;
 
     // Create the main frame window
     MyFrame* frame = new MyFrame;
 


@@ -629,11 +634,21 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 }
 
 #if USE_LOG_WINDOW
 }
 
 #if USE_LOG_WINDOW

+

 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_textctrl->Clear();
 }
 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_textctrl->Clear();
 }

-#endif
+
+void MyFrame::OnClearLogUpdateUI(wxUpdateUIEvent& event)
+{
+    // if we only enable this item when the log window is empty, we never see
+    // it in the disable state as a message is logged whenever the menu is
+    // opened, so we disable it if there is not "much" text in the window
+    event.Enable( m_textctrl->GetNumberOfLines() > 5 );
+}
+
+#endif // USE_LOG_WINDOW

 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {