some very minor changes

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

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 948d55c5935ffefd8a1ea2cad3f3181e3645b132..b3a02100eecc8ce913268dbf430bbb3b26240400 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -85,9 +85,7 @@ protected:
 
 class WXDLLEXPORT wxTabLayer: public wxList
 {
 
 class WXDLLEXPORT wxTabLayer: public wxList
 {

-// Why did someone remove this, please?
-DECLARE_DYNAMIC_CLASS(wxTabLayer)
-  wxTabLayer():wxList() {}
+  DECLARE_DYNAMIC_CLASS(wxTabLayer)

 };
 
 /*
 };
 
 /*

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 52e44a77e182b1828c3a00529350481d896bd714..fd9b103b3dc65af5c628320ae2b49007bacd3d5f 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -806,11 +806,11 @@ wxFrame *wxLogWindow::GetFrame() const
   return m_pLogFrame;
 }
 
   return m_pLogFrame;
 }
 

-void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
+void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))

 {
 }
 
 {
 }
 

-void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
+void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))

 {
   m_pLogFrame = (wxLogFrame *)NULL;
 }
 {
   m_pLogFrame = (wxLogFrame *)NULL;
 }

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 09c77c3479d7caebc960d6a82122ff0fadbc7c02..11d281273ed14f7c51bf8971bbbcffdb99533213 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -152,7 +152,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 

-  wxASSERT( id != -1 ); // should find it!
+  // should find it for normal (not popup) menu
+  wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 

 
   if (!menu->IsEnabled(id)) return;
 
 
   if (!menu->IsEnabled(id)) return;
 

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 09c77c3479d7caebc960d6a82122ff0fadbc7c02..11d281273ed14f7c51bf8971bbbcffdb99533213 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -152,7 +152,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 

-  wxASSERT( id != -1 ); // should find it!
+  // should find it for normal (not popup) menu
+  wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 

 
   if (!menu->IsEnabled(id)) return;
 
 
   if (!menu->IsEnabled(id)) return;