fix for handling from Francesco

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 42e5c5cd037c44554a8bb3f55745661d31ce9846..911731b7d8ac36b64a3b8b41cbf65372d8156fc6 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -96,6 +96,7 @@
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"
     #include "wx/msw/registry.h"
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"
     #include "wx/msw/registry.h"

+    #include <shellapi.h> // needed for SHELLEXECUTEINFO

 #endif
 
 #if wxUSE_BASE
 #endif
 
 #if wxUSE_BASE


@@ -286,22 +287,20 @@ wxString wxGetDataDir()
     return dir;
 }
 
     return dir;
 }
 

-int wxGetOsVersion(int *verMaj, int *verMin)
+bool wxIsPlatformLittleEndian()

 {
 {

-    // we want this function to work even if there is no wxApp
-    wxConsoleAppTraits traitsConsole;
-    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    if ( ! traits )
-        traits = &traitsConsole;
+    // Are we little or big endian? This method is from Harbison & Steele.
+    union
+    {
+        long l;
+        char c[sizeof(long)];
+    } u;
+    u.l = 1;

 
 

-    wxToolkitInfo& info = traits->GetToolkitInfo();
-    if ( verMaj )
-        *verMaj = info.versionMajor;
-    if ( verMin )
-        *verMin = info.versionMinor;
-    return info.os;
+    return u.c[0] == 1;

 }
 
 }
 

+

 /*
  * Class to make it easier to specify platform-dependent values
  */
 /*
  * Class to make it easier to specify platform-dependent values
  */


@@ -441,13 +440,18 @@ void wxPlatform::ClearPlatforms()
 bool wxPlatform::Is(int platform)
 {
 #ifdef __WXMSW__
 bool wxPlatform::Is(int platform)
 {
 #ifdef __WXMSW__

-    if (platform == wxMSW)
+    if (platform == wxOS_WINDOWS)

         return true;
 #endif
 #ifdef __WXWINCE__
         return true;
 #endif
 #ifdef __WXWINCE__

-    if (platform == wxWinCE)
+    if (platform == wxOS_WINDOWS_CE)

         return true;
 #endif
         return true;
 #endif

+
+#if 0
+
+// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols
+

 #if defined(__WXWINCE__) && defined(__POCKETPC__)
     if (platform == wxWinPocketPC)
         return true;
 #if defined(__WXWINCE__) && defined(__POCKETPC__)
     if (platform == wxWinPocketPC)
         return true;


@@ -456,32 +460,39 @@ bool wxPlatform::Is(int platform)
     if (platform == wxWinSmartPhone)
         return true;
 #endif
     if (platform == wxWinSmartPhone)
         return true;
 #endif

+
+#endif
+

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    if (platform == wxGTK)
+    if (platform == wxPORT_GTK)

         return true;
 #endif
 #ifdef __WXMAC__
         return true;
 #endif
 #ifdef __WXMAC__

-    if (platform == wxMac)
+    if (platform == wxPORT_MAC)

         return true;
 #endif
 #ifdef __WXX11__
         return true;
 #endif
 #ifdef __WXX11__

-    if (platform == wxX11)
+    if (platform == wxPORT_X11)

         return true;
 #endif
 #ifdef __UNIX__
         return true;
 #endif
 #ifdef __UNIX__

-    if (platform == wxUnix)
+    if (platform == wxOS_UNIX)

         return true;
 #endif
 #ifdef __WXMGL__
         return true;
 #endif
 #ifdef __WXMGL__

-    if (platform == wxMGL)
+    if (platform == wxPORT_MGL)

         return true;
 #endif
         return true;
 #endif

-#ifdef __WXOS2__
-    if (platform == wxOS2)
+#ifdef __OS2__
+    if (platform == wxOS_OS2)
+        return true;
+#endif
+#ifdef __WXPM__
+    if (platform == wxPORT_PM)

         return true;
 #endif
 #ifdef __WXCOCOA__
         return true;
 #endif
 #ifdef __WXCOCOA__

-    if (platform == wxCocoa)
+    if (platform == wxPORT_MAC)

         return true;
 #endif
 
         return true;
 #endif
 


@@ -913,15 +924,18 @@ wxRegisterId (long id)
     wxCurrentId = id + 1;
 }
 
     wxCurrentId = id + 1;
 }
 

-#if wxUSE_MENUS
-

 // ----------------------------------------------------------------------------
 // Menu accelerators related functions
 // ----------------------------------------------------------------------------
 
 wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
 {
 // ----------------------------------------------------------------------------
 // Menu accelerators related functions
 // ----------------------------------------------------------------------------
 
 wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
 {

+#if wxUSE_MENUS

     wxString s = wxMenuItem::GetLabelFromText(in);
     wxString s = wxMenuItem::GetLabelFromText(in);

+#else
+    wxString str(in);
+    wxString s = wxStripMenuCodes(str);
+#endif // wxUSE_MENUS

     if ( out )
     {
         // go smash their buffer if it's not big enough - I love char * params
     if ( out )
     {
         // go smash their buffer if it's not big enough - I love char * params


@@ -937,8 +951,10 @@ wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
     return out;
 }
 
     return out;
 }
 

-wxString wxStripMenuCodes(const wxString& in)
+wxString wxStripMenuCodes(const wxString& in, int flags)

 {
 {

+    wxASSERT_MSG( flags, _T("this is useless to call without any flags") );
+

     wxString out;
 
     size_t len = in.length();
     wxString out;
 
     size_t len = in.length();


@@ -947,7 +963,7 @@ wxString wxStripMenuCodes(const wxString& in)
     for ( size_t n = 0; n < len; n++ )
     {
         wxChar ch = in[n];
     for ( size_t n = 0; n < len; n++ )
     {
         wxChar ch = in[n];

-        if ( ch == _T('&') )
+        if ( (flags & wxStrip_Mnemonics) && ch == _T('&') )

         {
             // skip it, it is used to introduce the accel char (or to quote
             // itself in which case it should still be skipped): note that it
         {
             // skip it, it is used to introduce the accel char (or to quote
             // itself in which case it should still be skipped): note that it


@@ -962,7 +978,7 @@ wxString wxStripMenuCodes(const wxString& in)
                 ch = in[n];
             }
         }
                 ch = in[n];
             }
         }

-        else if ( ch == _T('\t') )
+        else if ( (flags & wxStrip_Accel) && ch == _T('\t') )

         {
             // everything after TAB is accel string, exit the loop
             break;
         {
             // everything after TAB is accel string, exit the loop
             break;


@@ -974,8 +990,6 @@ wxString wxStripMenuCodes(const wxString& in)
     return out;
 }
 
     return out;
 }
 

-#endif // wxUSE_MENUS
-

 // ----------------------------------------------------------------------------
 // Window search functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Window search functions
 // ----------------------------------------------------------------------------


@@ -1010,12 +1024,12 @@ int
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
 #if wxUSE_MENUS
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
 #if wxUSE_MENUS

-  wxMenuBar *menuBar = frame->GetMenuBar ();
-  if ( menuBar )
-      return menuBar->FindMenuItem (menuString, itemString);
+    wxMenuBar *menuBar = frame->GetMenuBar ();
+    if ( menuBar )
+        return menuBar->FindMenuItem (menuString, itemString);

 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS
 

-  return wxNOT_FOUND;
+    return wxNOT_FOUND;

 }
 
 // Try to find the deepest child that contains 'pt'.
 }
 
 // Try to find the deepest child that contains 'pt'.


@@ -1063,7 +1077,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
     }
 
     wxRect rect(pos, sz);
     }
 
     wxRect rect(pos, sz);

-    if (rect.Inside(pt))
+    if (rect.Contains(pt))

         return win;
 
     return NULL;
         return win;
 
     return NULL;