check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / xrc / xh_menu.cpp

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 5df0d5f8d5f779f47feffcd6b7097b285838fde6..7174aa7dda6ee81c975e71736c4447e0e0e0de7c 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_menu.cpp
+// Name:        src/xrc/xh_menu.cpp

 // Purpose:     XRC resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
-#pragma implementation "xh_menu.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,14 +15,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_MENUS
+

 #include "wx/xrc/xh_menu.h"
 #include "wx/xrc/xh_menu.h"

-#include "wx/menu.h"
-#include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 

-wxMenuXmlHandler::wxMenuXmlHandler() : 
-        wxXmlResourceHandler(), m_insideMenu(FALSE)
+wxMenuXmlHandler::wxMenuXmlHandler() :
+        wxXmlResourceHandler(), m_insideMenu(false)

 {
     XRC_ADD_STYLE(wxMENU_TEAROFF);
 }
 {
     XRC_ADD_STYLE(wxMENU_TEAROFF);
 }


@@ -35,23 +36,31 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))
     {
 {
     if (m_class == wxT("wxMenu"))
     {

-        wxMenu *menu = new wxMenu(GetStyle());
+        wxMenu *menu = m_instance ? wxStaticCast(m_instance, wxMenu)
+                                  : new wxMenu(GetStyle());
+

         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));

-        
+

         bool oldins = m_insideMenu;
         bool oldins = m_insideMenu;

-        m_insideMenu = TRUE;
-        CreateChildren(menu, TRUE/*only this handler*/);
+        m_insideMenu = true;
+        CreateChildren(menu, true/*only this handler*/);

         m_insideMenu = oldins;
 
         wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
         if (p_bar)
         m_insideMenu = oldins;
 
         wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
         if (p_bar)

+        {

             p_bar->Append(menu, title);
             p_bar->Append(menu, title);

+        }

         else
         {
             wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
             if (p_menu)
         else
         {
             wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
             if (p_menu)

+            {

                 p_menu->Append(GetID(), title, menu, help);
                 p_menu->Append(GetID(), title, menu, help);

+                if (HasParam(wxT("enabled")))
+                    p_menu->Enable(GetID(), GetBool(wxT("enabled")));
+            }

         }
 
         return menu;
         }
 
         return menu;


@@ -60,18 +69,18 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
     else
     {
         wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
     else
     {
         wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);

-        
+

         if (m_class == wxT("separator"))
             p_menu->AppendSeparator();
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/
         if (m_class == wxT("separator"))
             p_menu->AppendSeparator();
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/

-        {          
+        {

             int id = GetID();
             wxString label = GetText(wxT("label"));
             int id = GetID();
             wxString label = GetText(wxT("label"));

-            wxString accel = GetText(wxT("accel"), FALSE);
+            wxString accel = GetText(wxT("accel"), false);

             wxString fullLabel = label;
             wxString fullLabel = label;

-            if (!accel.IsEmpty())
+            if (!accel.empty())

                 fullLabel << wxT("\t") << accel;
 
             wxItemKind kind = wxITEM_NORMAL;
                 fullLabel << wxT("\t") << accel;
 
             wxItemKind kind = wxITEM_NORMAL;


@@ -79,19 +88,19 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
                 kind = wxITEM_RADIO;
             if (GetBool(wxT("checkable")))
             {
                 kind = wxITEM_RADIO;
             if (GetBool(wxT("checkable")))
             {

-                wxASSERT_MSG( kind == wxITEM_NORMAL, _T("can't have both checkable and radion button at once") );
+                wxASSERT_MSG( kind == wxITEM_NORMAL, _T("can't have both checkable and radio button at once") );

                 kind = wxITEM_CHECK;
             }
 
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                 kind = wxITEM_CHECK;
             }
 
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);

-                                               
-#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
+
+#if (!defined(__WXMSW__) && !defined(__WXPM__)) || wxUSE_OWNER_DRAWN

             if (HasParam(wxT("bitmap")))
                 mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif
             p_menu->Append(mitem);
             if (HasParam(wxT("bitmap")))
                 mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif
             p_menu->Append(mitem);

-            mitem->Enable(GetBool(wxT("enabled"), TRUE));
+            mitem->Enable(GetBool(wxT("enabled"), true));

             if (kind == wxITEM_CHECK)
                 mitem->Check(GetBool(wxT("checked")));
         }
             if (kind == wxITEM_CHECK)
                 mitem->Check(GetBool(wxT("checked")));
         }


@@ -104,7 +113,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenu")) ||
 bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenu")) ||

-           (m_insideMenu && 
+           (m_insideMenu &&

                (IsOfClass(node, wxT("wxMenuItem")) ||
                 IsOfClass(node, wxT("break")) ||
                 IsOfClass(node, wxT("separator")))
                (IsOfClass(node, wxT("wxMenuItem")) ||
                 IsOfClass(node, wxT("break")) ||
                 IsOfClass(node, wxT("separator")))


@@ -139,3 +148,5 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 {
     return IsOfClass(node, wxT("wxMenuBar"));
 }

+
+#endif // wxUSE_XRC && wxUSE_MENUS