applying patch, fixes #10524

[wxWidgets.git] / src / palmos / menu.cpp

diff --git a/src/palmos/menu.cpp b/src/palmos/menu.cpp
index db6fbfc5323d3dd028b4e012fa53577cdabeb308..2725ce144822dd00c9001ecece9a58bc841d0e72 100644 (file)
--- a/src/palmos/menu.cpp
+++ b/src/palmos/menu.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "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"
 


@@ -30,9 +26,10 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+#include "wx/menu.h"
+

 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

-    #include "wx/menu.h"

     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -42,7 +39,12 @@
     #include "wx/ownerdrw.h"
 #endif
 
     #include "wx/ownerdrw.h"
 #endif
 

+#ifdef __WXPALMOS6__

 #include <Loader.h>
 #include <Loader.h>

+#else // __WXPALMOS5__
+#include <UIResources.h> // MenuRscType
+#endif
+

 #include <Form.h>
 #include <Menu.h>
 
 #include <Form.h>
 #include <Menu.h>
 


@@ -67,9 +69,9 @@ static const int idMenuTitle = -3;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"

 
 

-WX_DEFINE_LIST( wxMenuInfoList ) ;
+WX_DEFINE_LIST( wxMenuInfoList )

 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 


@@ -155,7 +157,7 @@ const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
     for( size_t i = 0 ; i < GetMenuCount() ; ++i )
     {
         wxMenuInfo* info = new wxMenuInfo() ;
     for( size_t i = 0 ; i < GetMenuCount() ; ++i )
     {
         wxMenuInfo* info = new wxMenuInfo() ;

-        info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
+        info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetMenuLabel(i) ) ;

         list->Append( info ) ;
     }
     return m_menuInfos ;
         list->Append( info ) ;
     }
     return m_menuInfos ;


@@ -375,11 +377,11 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
     // Palm OS does not have support for grayed or disabled items
 }
 
     // Palm OS does not have support for grayed or disabled items
 }
 

-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)

 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 
 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 

-    m_titles[pos]=wxStripMenuCodes(label);
+    m_titles[pos] = label;

 
     if ( !IsAttached() )
     {
 
     if ( !IsAttached() )
     {


@@ -390,12 +392,12 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     Refresh();
 }
 
     Refresh();
 }
 

-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const

 {
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
 {
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,

-                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+                 wxT("invalid menu index in wxMenuBar::GetMenuLabel") );

 
 

-    return wxMenuItem::GetLabelFromText(m_titles[pos]);
+    return m_titles[pos];

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -408,7 +410,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     if ( !menuOld )
         return NULL;
 
     if ( !menuOld )
         return NULL;
 

-    m_titles[pos]=wxStripMenuCodes(title);
+    m_titles[pos] = title;

 
     if ( IsAttached() )
     {
 
     if ( IsAttached() )
     {


@@ -424,7 +426,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 

-    m_titles.Insert(wxStripMenuCodes(title), pos);
+    m_titles.Insert(title, pos);

 
     if ( IsAttached() )
     {
 
     if ( IsAttached() )
     {


@@ -440,7 +442,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return false;
 
     if ( !wxMenuBarBase::Append(menu, title) )
         return false;
 

-    m_titles.Add(wxStripMenuCodes(title));
+    m_titles.Add(title);

 
     if(IsAttached())
     {
 
     if(IsAttached())
     {


@@ -540,12 +542,13 @@ void wxMenuBar::LoadMenu()
 {
     int i=0;
     int j=0;
 {
     int i=0;
     int j=0;

-
+#ifdef __WXPALMOS6__

     // Handle to the currently running application database
     DmOpenRef    AppDB;
 
     // Get app database reference - needed for some Palm OS Menu API calls.
     SysGetModuleDatabase(SysGetRefNum(), NULL, &AppDB);
     // Handle to the currently running application database
     DmOpenRef    AppDB;
 
     // Get app database reference - needed for some Palm OS Menu API calls.
     SysGetModuleDatabase(SysGetRefNum(), NULL, &AppDB);

+#endif // __WXPALMOS6__

 
     // Get the number of menus
     int NumMenus=GetMenuCount();
 
     // Get the number of menus
     int NumMenus=GetMenuCount();


@@ -557,24 +560,24 @@ void wxMenuBar::LoadMenu()
     // Load the menu template and set up the menu pointers
     if(NumMenus==1)
     {
     // Load the menu template and set up the menu pointers
     if(NumMenus==1)
     {

-        PalmOSMenuBar=DmGetResource(AppDB,'MBAR',1000);
-        PalmOSMenuBarPtr=(char *)MemHandleLock(PalmOSMenuBar);
+        PalmOSMenuBar = POS_DmGetResource (AppDB, MenuRscType, 1000);
+        PalmOSMenuBarPtr = (char *)MemHandleLock (PalmOSMenuBar);

 
 

-        PalmOSMenuBarPtr+=74;
+        PalmOSMenuBarPtr += 74;

     }
     else if(NumMenus==2)
     {
     }
     else if(NumMenus==2)
     {

-        PalmOSMenuBar=DmGetResource(AppDB,'MBAR',2000);
-        PalmOSMenuBarPtr=(char *)MemHandleLock(PalmOSMenuBar);
+        PalmOSMenuBar = POS_DmGetResource (AppDB, MenuRscType, 2000);
+        PalmOSMenuBarPtr = (char *)MemHandleLock (PalmOSMenuBar);

 
 

-        PalmOSMenuBarPtr+=116;
+        PalmOSMenuBarPtr += 116;

     }
     else if(NumMenus==3)
     {
     }
     else if(NumMenus==3)
     {

-        PalmOSMenuBar=DmGetResource(AppDB,'MBAR',3000);
-        PalmOSMenuBarPtr=(char *)MemHandleLock(PalmOSMenuBar);
+        PalmOSMenuBar = POS_DmGetResource (AppDB, MenuRscType, 3000);
+        PalmOSMenuBarPtr = (char *)MemHandleLock (PalmOSMenuBar);

 
 

-        PalmOSMenuBarPtr+=158;
+        PalmOSMenuBarPtr += 158;

     }
     else
     {
     }
     else
     {


@@ -582,10 +585,10 @@ void wxMenuBar::LoadMenu()
         // more than we can handle.
         NumMenus=4;
 
         // more than we can handle.
         NumMenus=4;
 

-        PalmOSMenuBar=DmGetResource(AppDB,'MBAR',4000);
-        PalmOSMenuBarPtr=(char *)MemHandleLock(PalmOSMenuBar);
+        PalmOSMenuBar = POS_DmGetResource (AppDB, MenuRscType, 4000);
+        PalmOSMenuBarPtr = (char *)MemHandleLock (PalmOSMenuBar);

 
 

-        PalmOSMenuBarPtr+=200;
+        PalmOSMenuBarPtr += 200;

     }
 
     // Set the proper names for the drop-down triggers.
     }
 
     // Set the proper names for the drop-down triggers.


@@ -598,11 +601,11 @@ void wxMenuBar::LoadMenu()
         wxString MenuTitle=m_titles.Item(i);
 
         // Make sure we don't copy more than 8 bytes for the label
         wxString MenuTitle=m_titles.Item(i);
 
         // Make sure we don't copy more than 8 bytes for the label

-        int LengthToCopy=MenuTitle.length();
-        if(LengthToCopy>8)
-            LengthToCopy=8;
+        int LengthToCopy = MenuTitle.length();
+        if(LengthToCopy > 8)
+            LengthToCopy = 8;

 
 

-        MemMove(PalmOSMenuBarPtr,MenuTitle,LengthToCopy);
+        MemMove(PalmOSMenuBarPtr,(char*)(&MenuTitle),LengthToCopy);

         PalmOSMenuBarPtr+=11;
     }
 
         PalmOSMenuBarPtr+=11;
     }
 


@@ -612,7 +615,7 @@ void wxMenuBar::LoadMenu()
 
     // We must make the menu active before we can add items to the drop-down
     // triggers.
 
     // We must make the menu active before we can add items to the drop-down
     // triggers.

-    FrmSetMenu(FrmGetActiveForm(),AppDB,NumMenus*1000);
+    POS_FrmSetMenu (FrmGetActiveForm(), AppDB, NumMenus * 1000);

 
     /* Add the menu items to the drop-down triggers.  This must be done after
      * setting the triggers, because setting the names of drop-down triggers
 
     /* Add the menu items to the drop-down triggers.  This must be done after
      * setting the triggers, because setting the names of drop-down triggers


@@ -640,9 +643,9 @@ void wxMenuBar::LoadMenu()
             else
             {
                 if(j==0)
             else
             {
                 if(j==0)

-                    MenuAddItem(9000+i,((i*1000)+1000)+j,0x00,ItemLabel);
+                    MenuAddItem(9000+i,((i*1000)+1000)+j,0x00,(char *)(&ItemLabel));

                 else
                 else

-                    MenuAddItem(((i*1000)+1000)+j-1,((i*1000)+1000)+j,0x00,ItemLabel);
+                    MenuAddItem(((i*1000)+1000)+j-1,((i*1000)+1000)+j,0x00,(char *)(&ItemLabel));

             }
         }
 
             }
         }