Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index edb60fb2c9a647fb85ea4911dcd5fab54d307415..bf310d7f9d363e84b0165a1b699156a1b4e72f0b 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,6 +25,7 @@
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"


@@ -40,15 +40,16 @@ extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-#if wxUSE_MENUS && wxUSE_STATUSBAR
+#if wxUSE_MENUS
+
+#if wxUSE_STATUSBAR

 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()

-
-#endif // wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+#endif // wxUSE_STATUSBAR

 
 /* static */
 bool wxFrameBase::ShouldUpdateMenuFromIdle()
 
 /* static */
 bool wxFrameBase::ShouldUpdateMenuFromIdle()


@@ -58,7 +59,7 @@ bool wxFrameBase::ShouldUpdateMenuFromIdle()
     // check if we're using the global menu bar as we don't get EVT_MENU_OPEN
     // for it and need to fall back to idle time updating even if normally
     // wxUSE_IDLEMENUUPDATES is set to 0 for wxGTK.
     // check if we're using the global menu bar as we don't get EVT_MENU_OPEN
     // for it and need to fall back to idle time updating even if normally
     // wxUSE_IDLEMENUUPDATES is set to 0 for wxGTK.

-#ifdef __WXGTK__
+#ifdef __WXGTK20__

     if ( wxApp::GTKIsUsingGlobalMenu() )
         return true;
 #endif // !__WXGTK__
     if ( wxApp::GTKIsUsingGlobalMenu() )
         return true;
 #endif // !__WXGTK__


@@ -66,6 +67,8 @@ bool wxFrameBase::ShouldUpdateMenuFromIdle()
     return wxUSE_IDLEMENUUPDATES != 0;
 }
 
     return wxUSE_IDLEMENUUPDATES != 0;
 }
 

+#endif // wxUSE_MENUS
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -127,7 +130,7 @@ wxEND_FLAGS( wxFrameStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxFrame)
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxFrame)

-wxEVENT_PROPERTY( Menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
+wxEVENT_PROPERTY( Menu, wxEVT_MENU, wxCommandEvent)

 
 wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
            wxT("Helpstring"), wxT("group"))
 
 wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
            wxT("Helpstring"), wxT("group"))


@@ -558,7 +561,7 @@ wxToolBar* wxFrameBase::CreateToolBar(long style,
         //      a) this allows us to have different defaults for different
         //         platforms (even if we don't have them right now)
         //      b) we don't need to include wx/toolbar.h in the header then
         //      a) this allows us to have different defaults for different
         //         platforms (even if we don't have them right now)
         //      b) we don't need to include wx/toolbar.h in the header then

-        style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
+        style = wxTB_DEFAULT_STYLE;

     }
 
     SetToolBar(OnCreateToolBar(style, id, name));
     }
 
     SetToolBar(OnCreateToolBar(style, id, name));