compilation fixes for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/app.h

@@ -31,6 +31,18 @@
     typedef wxObject* (*wxAppInitializerFunction)();
 #endif
 
+// ----------------------------------------------------------------------------
+// headers we have to include here
+// ----------------------------------------------------------------------------
+
+#include "wx/event.h"       // for the base class
+
+#include "wx/window.h"      // for wxTopLevelWindows
+
+#if wxUSE_LOG
+    #include "wx/log.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

include/wx/image.h

@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_
@@ -18,9 +18,10 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
+#include "wx/bitmap.h"
 
 #if wxUSE_STREAMS
-#include "wx/stream.h"
+    #include "wx/stream.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -37,8 +38,6 @@ class WXDLLEXPORT wxJPEGHandler;
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
-class WXDLLEXPORT wxBitmap;
-
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
@@ -46,7 +45,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxImageHandler)
-  
+
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
@@ -69,7 +68,7 @@ protected:
   wxString  m_extension;
   wxString  m_mime;
   long      m_type;
-  
+
 };
 
 //-----------------------------------------------------------------------------
@@ -80,7 +79,7 @@ protected:
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
-  
+
 public:
 
   inline wxPNGHandler()
@@ -131,7 +130,7 @@ public:
 class WXDLLEXPORT wxBMPHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPHandler)
-  
+
 public:
 
   inline wxBMPHandler()
@@ -192,27 +191,27 @@ public:
 
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
-  
+
-  // these functions get implemented in /src/(platform)/bitmap.cpp 
+  // these functions get implemented in /src/(platform)/bitmap.cpp
   wxImage( const wxBitmap &bitmap );
   operator wxBitmap() const { return ConvertToBitmap(); }
   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
-  
+
   // return the new image with size width*height
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place
-  wxImage Rescale( int width, int height ) { *this = Scale(width, height); }
+  void Rescale( int width, int height ) { *this = Scale(width, height); }
 
-  // these routines are slow but safe  
+  // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetRed( int x, int y );
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );
-  
+
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   virtual bool LoadFile( const wxString& name, const wxString& mimetype );
 
@@ -235,7 +234,7 @@ public:
 
   char unsigned *GetData() const;
   void SetData( char unsigned *data );
-  
+
   void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetMaskRed() const;
   unsigned char GetMaskGreen() const;
@@ -252,7 +251,7 @@ public:
 
   bool operator == (const wxImage& image)
     { return m_refData == image.m_refData; }
-  bool operator != (const wxImage& image) 
+  bool operator != (const wxImage& image)
     { return m_refData != image.m_refData; }
 
   static wxList& GetHandlers() { return sm_handlers; }
@@ -270,7 +269,7 @@ public:
 protected:
 
   static wxList sm_handlers;
-  
+
 };
 
 #endif

src/gtk/app.cpp

@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+    #pragma implementation "appbase.h"
     #pragma implementation "app.h"
 #endif
 

src/gtk/menu.cpp

@@ -36,9 +36,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */
-    m_needParent = FALSE; 
+    m_needParent = FALSE;
     m_style = style;
-    
+
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
 
     m_menus.DeleteContents( TRUE );
@@ -48,7 +48,7 @@ wxMenuBar::wxMenuBar( long style )
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
     m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
@@ -71,7 +71,7 @@ wxMenuBar::wxMenuBar()
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = 0;
-    
+
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 
     m_menus.DeleteContents( TRUE );
@@ -81,7 +81,7 @@ wxMenuBar::wxMenuBar()
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
     m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
@@ -183,30 +183,30 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
-    
+
     const wxChar *pc;
-    
+
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
     for ( pc = title; *pc != _T('\0'); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
             str << _T('_');
-        } else 
+        } else
-	if (*pc == _T('/'))
+        if (*pc == _T('/'))
-	{
+        {
             str << _T('\\');
 #endif
-	}
+        }
         else
            str << *pc;
     }
 
     /* this doesn't have much effect right now */
     menu->SetTitle( str );
-    
+
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
 
@@ -215,7 +215,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     buf << '/' << str.mb_str();
     char *cbuf = new char[buf.Length()];
     GtkItemFactoryEntry entry;
-    entry.path = buf.c_str();
+    entry.path = (gchar *)buf.c_str();  // const_cast
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
@@ -239,7 +239,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 
     gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
-    
+
 #endif
 }
 
@@ -565,19 +565,19 @@ void wxMenuItem::SetName( const wxString& str )
     for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');
-        } else 
+        } else
-	if (*pc == _T('/'))      /* we have to filter out slashes ... */
+        if (*pc == _T('/'))      /* we have to filter out slashes ... */
-	{
+        {
             m_text << _T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
            m_text << *pc;
     }
-    
+
     /* only GTK 1.2 knows about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)
@@ -649,12 +649,12 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
     m_items.DeleteContents( TRUE );
     m_invokingWindow = (wxWindow *) NULL;
     m_style = style;
-    
+
 #if (GTK_MINOR_VERSION > 0)
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
     m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
@@ -684,7 +684,7 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
        entry.item_type = "<Tearoff>";
        entry.accelerator = (gchar*) NULL;
        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-       GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
     }
 #endif
 }
@@ -717,9 +717,9 @@ void wxMenu::AppendSeparator()
     entry.callback_action = 0;
     entry.item_type = "<Separator>";
     entry.accelerator = (gchar*) NULL;
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* this will be wrong for more than one separator. do we care? */
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
 #else
@@ -727,7 +727,7 @@ void wxMenu::AppendSeparator()
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
 #endif
-    
+
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
@@ -735,37 +735,37 @@ void wxMenu::AppendSeparator()
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;
-    
+
     switch (hotkey[0])
     {
         case _T('a'):   /* Alt */
-	case _T('A'):
+        case _T('A'):
-	case _T('m'):   /* Meta */
+        case _T('m'):   /* Meta */
-	case _T('M'):
+        case _T('M'):
-	{
+        {
-	    strcpy( hotbuf, "<alt>" );
+            strcpy( hotbuf, "<alt>" );
-	    wxString last = hotkey.Right(1);
+            wxString last = hotkey.Right(1);
-	    strcat( hotbuf, last.mb_str() );
+            strcat( hotbuf, last.mb_str() );
-            return hotbuf;
-	}
-	case _T('c'):    /* Ctrl */
-	case _T('C'):
-	case _T('s'):    /* Strg, yeah man, I'm German */
-	case _T('S'):
-	{
-	    strcpy( hotbuf, "<control>" );
-	    wxString last = hotkey.Right(1);
-	    strcat( hotbuf, last.mb_str() );
             return hotbuf;
         }
-	case _T('F'):   /* function keys */
+        case _T('c'):    /* Ctrl */
-	{
+        case _T('C'):
-	    strcpy( hotbuf, hotkey.mb_str() );
+        case _T('s'):    /* Strg, yeah man, I'm German */
+        case _T('S'):
+        {
+            strcpy( hotbuf, "<control>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
             return hotbuf;
-	}
+        }
-	default:
+        case _T('F'):   /* function keys */
-	{
+        {
-	}
+            strcpy( hotbuf, hotkey.mb_str() );
+            return hotbuf;
+        }
+        default:
+        {
+        }
     }
     return (char*) NULL;
 }
@@ -777,16 +777,16 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);
-    
+
 #if (GTK_MINOR_VERSION > 0)
-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* text has "_" instead of "&" after mitem->SetText() */
     wxString text( mitem->GetText() );
-    
+
     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
-    
+
     GtkItemFactoryEntry entry;
     entry.path = buf;
     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
@@ -795,12 +795,12 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         entry.item_type = "<CheckItem>";
     else
         entry.item_type = "<Item>";
-    
+
     char hotbuf[50];
     entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     wxString s = _T("<main>/");
     for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
@@ -808,21 +808,21 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
+
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
-    
+
 #else
 
     GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
                                     : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
-				    
+
     gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                         GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                         (gpointer)this );
-			
+
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+
 #endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
@@ -846,22 +846,22 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     mitem->SetHelp(helpStr);
 
 #if (GTK_MINOR_VERSION > 0)
-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* text has "_" instead of "&" after mitem->SetText() */
     wxString text( mitem->GetText() );
-    
+
     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
-    
+
     GtkItemFactoryEntry entry;
     entry.path = buf;
     entry.callback = (GtkItemFactoryCallback) 0;
     entry.callback_action = 0;
     entry.item_type = "<Branch>";
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     wxString s = _T("<main>/");
     for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
@@ -869,17 +869,17 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
+
     GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
-    
+
 #else
 
     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
-    
+
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+
-#endif    
+#endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
@@ -890,7 +890,7 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-    
+
     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 
@@ -940,8 +940,8 @@ int wxMenu::FindItem( const wxString itemString ) const
     for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
-	    pc++; /* skip it */
+            pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
             s << _T('_');
 #endif

src/gtk1/app.cpp

@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+    #pragma implementation "appbase.h"
     #pragma implementation "app.h"
 #endif
 

src/gtk1/menu.cpp

@@ -36,9 +36,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */
-    m_needParent = FALSE; 
+    m_needParent = FALSE;
     m_style = style;
-    
+
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
 
     m_menus.DeleteContents( TRUE );
@@ -48,7 +48,7 @@ wxMenuBar::wxMenuBar( long style )
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
     m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
@@ -71,7 +71,7 @@ wxMenuBar::wxMenuBar()
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = 0;
-    
+
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 
     m_menus.DeleteContents( TRUE );
@@ -81,7 +81,7 @@ wxMenuBar::wxMenuBar()
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
     m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
@@ -183,30 +183,30 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
-    
+
     const wxChar *pc;
-    
+
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
     for ( pc = title; *pc != _T('\0'); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
             str << _T('_');
-        } else 
+        } else
-	if (*pc == _T('/'))
+        if (*pc == _T('/'))
-	{
+        {
             str << _T('\\');
 #endif
-	}
+        }
         else
            str << *pc;
     }
 
     /* this doesn't have much effect right now */
     menu->SetTitle( str );
-    
+
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
 
@@ -215,7 +215,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     buf << '/' << str.mb_str();
     char *cbuf = new char[buf.Length()];
     GtkItemFactoryEntry entry;
-    entry.path = buf.c_str();
+    entry.path = (gchar *)buf.c_str();  // const_cast
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
@@ -239,7 +239,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 
     gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
-    
+
 #endif
 }
 
@@ -565,19 +565,19 @@ void wxMenuItem::SetName( const wxString& str )
     for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');
-        } else 
+        } else
-	if (*pc == _T('/'))      /* we have to filter out slashes ... */
+        if (*pc == _T('/'))      /* we have to filter out slashes ... */
-	{
+        {
             m_text << _T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
            m_text << *pc;
     }
-    
+
     /* only GTK 1.2 knows about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)
@@ -649,12 +649,12 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
     m_items.DeleteContents( TRUE );
     m_invokingWindow = (wxWindow *) NULL;
     m_style = style;
-    
+
 #if (GTK_MINOR_VERSION > 0)
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
     m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
@@ -684,7 +684,7 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
        entry.item_type = "<Tearoff>";
        entry.accelerator = (gchar*) NULL;
        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-       GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
     }
 #endif
 }
@@ -717,9 +717,9 @@ void wxMenu::AppendSeparator()
     entry.callback_action = 0;
     entry.item_type = "<Separator>";
     entry.accelerator = (gchar*) NULL;
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* this will be wrong for more than one separator. do we care? */
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
 #else
@@ -727,7 +727,7 @@ void wxMenu::AppendSeparator()
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
 #endif
-    
+
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
@@ -735,37 +735,37 @@ void wxMenu::AppendSeparator()
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;
-    
+
     switch (hotkey[0])
     {
         case _T('a'):   /* Alt */
-	case _T('A'):
+        case _T('A'):
-	case _T('m'):   /* Meta */
+        case _T('m'):   /* Meta */
-	case _T('M'):
+        case _T('M'):
-	{
+        {
-	    strcpy( hotbuf, "<alt>" );
+            strcpy( hotbuf, "<alt>" );
-	    wxString last = hotkey.Right(1);
+            wxString last = hotkey.Right(1);
-	    strcat( hotbuf, last.mb_str() );
+            strcat( hotbuf, last.mb_str() );
-            return hotbuf;
-	}
-	case _T('c'):    /* Ctrl */
-	case _T('C'):
-	case _T('s'):    /* Strg, yeah man, I'm German */
-	case _T('S'):
-	{
-	    strcpy( hotbuf, "<control>" );
-	    wxString last = hotkey.Right(1);
-	    strcat( hotbuf, last.mb_str() );
             return hotbuf;
         }
-	case _T('F'):   /* function keys */
+        case _T('c'):    /* Ctrl */
-	{
+        case _T('C'):
-	    strcpy( hotbuf, hotkey.mb_str() );
+        case _T('s'):    /* Strg, yeah man, I'm German */
+        case _T('S'):
+        {
+            strcpy( hotbuf, "<control>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
             return hotbuf;
-	}
+        }
-	default:
+        case _T('F'):   /* function keys */
-	{
+        {
-	}
+            strcpy( hotbuf, hotkey.mb_str() );
+            return hotbuf;
+        }
+        default:
+        {
+        }
     }
     return (char*) NULL;
 }
@@ -777,16 +777,16 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);
-    
+
 #if (GTK_MINOR_VERSION > 0)
-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* text has "_" instead of "&" after mitem->SetText() */
     wxString text( mitem->GetText() );
-    
+
     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
-    
+
     GtkItemFactoryEntry entry;
     entry.path = buf;
     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
@@ -795,12 +795,12 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         entry.item_type = "<CheckItem>";
     else
         entry.item_type = "<Item>";
-    
+
     char hotbuf[50];
     entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     wxString s = _T("<main>/");
     for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
@@ -808,21 +808,21 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
+
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
-    
+
 #else
 
     GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
                                     : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
-				    
+
     gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                         GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                         (gpointer)this );
-			
+
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+
 #endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
@@ -846,22 +846,22 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     mitem->SetHelp(helpStr);
 
 #if (GTK_MINOR_VERSION > 0)
-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* text has "_" instead of "&" after mitem->SetText() */
     wxString text( mitem->GetText() );
-    
+
     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
-    
+
     GtkItemFactoryEntry entry;
     entry.path = buf;
     entry.callback = (GtkItemFactoryCallback) 0;
     entry.callback_action = 0;
     entry.item_type = "<Branch>";
-    
+
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    
+
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     wxString s = _T("<main>/");
     for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
@@ -869,17 +869,17 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
+
     GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
-    
+
 #else
 
     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
-    
+
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+
-#endif    
+#endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
@@ -890,7 +890,7 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-    
+
     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 
@@ -940,8 +940,8 @@ int wxMenu::FindItem( const wxString itemString ) const
     for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
     {
         if (*pc == _T('&'))
-	{
+        {
-	    pc++; /* skip it */
+            pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
             s << _T('_');
 #endif