added wxFrame::Command()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 6aa0cd9fa116d1a310b68e1fb87415864632784f..e73c31dda6ffffd10c0d249f6147cf4a9f947cbc 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -164,7 +164,7 @@ toolkit. You must do this by running configure with either of:
 
 The following options handle the kind of library you want to build.
 
 
 The following options handle the kind of library you want to build.
 

-       --with-threads          Compile without thread support.
+       --with-threads          Compile with thread support.

 
        --without-shared        Do not create shared libraries.
 
 
        --without-shared        Do not create shared libraries.
 

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index fc73faa091b25db875a66fb958fe0f4fc7cfa4b1..de86ad8e1a0fb8029dd60fe2516b294394e05679 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -92,6 +92,8 @@ public:
     virtual void Maximize(bool WXUNUSED(maximize)) {}
     virtual void Restore() {}
 
     virtual void Maximize(bool WXUNUSED(maximize)) {}
     virtual void Restore() {}
 

+    virtual void Command( int id );
+    

     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );
     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index fc73faa091b25db875a66fb958fe0f4fc7cfa4b1..de86ad8e1a0fb8029dd60fe2516b294394e05679 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -92,6 +92,8 @@ public:
     virtual void Maximize(bool WXUNUSED(maximize)) {}
     virtual void Restore() {}
 
     virtual void Maximize(bool WXUNUSED(maximize)) {}
     virtual void Restore() {}
 

+    virtual void Command( int id );
+    

     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );
     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index b8198a328848f2aa0d24fa230f398916a158d1c5..84899e1e489099cdb61e61836efd7e70704a18bf 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -640,6 +640,23 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
     return statusBar;
 }
 

+void wxFrame::Command( int id )
+{
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+    GetEventHandler()->ProcessEvent(commandEvent);
+}
+

 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index b8198a328848f2aa0d24fa230f398916a158d1c5..84899e1e489099cdb61e61836efd7e70704a18bf 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -640,6 +640,23 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
     return statusBar;
 }
 

+void wxFrame::Command( int id )
+{
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+    GetEventHandler()->ProcessEvent(commandEvent);
+}
+

 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );