X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dbe38c3700099a9c3d8423131eff0a8f394a0a4..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/src/common/framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 8bc2ffb5db..77d1c1e1c4 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -152,7 +152,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 
-#if wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
@@ -196,6 +196,7 @@ bool wxFrameBase::ProcessCommand(int id)
         if (item->IsCheckable())
         {
             item->Toggle();
+
             // use the new value
             commandEvent.SetInt(item->IsChecked());
         }