1. wxChoice and wxComboBox support client data under MSW

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index e2b79dbf829a6a1c3f3825aa301afa71a0d562f2..64c2b57e440be933c59920fbaa41bf5105056b56 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -36,7 +36,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */
 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" );
 
 
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
 


@@ -47,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>" );
     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
 
     m_menubar = gtk_menu_bar_new();
 #endif
 


@@ -69,6 +70,7 @@ wxMenuBar::wxMenuBar()
 {
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
 {
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;

+    m_style = 0;

 
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 
 
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 


@@ -79,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>" );
     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
 
     m_menubar = gtk_menu_bar_new();
 #endif
 


@@ -181,57 +183,58 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
 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;
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;

-    for ( const wxChar *pc = title; *pc != _T('\0'); pc++ )
+    for ( pc = title; *pc != _T('\0'); pc++ )

     {
         if (*pc == _T('&'))
     {
         if (*pc == _T('&'))

-       {
+        {

 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
             str << _T('_');
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
             str << _T('_');

-        } else 
-       if (*pc == _T('/'))
-       {
+        } else
+        if (*pc == _T('/'))
+        {

             str << _T('\\');
 #endif
             str << _T('\\');
 #endif

-       }
+        }

         else
            str << *pc;
     }
 
     /* this doesn't have much effect right now */
     menu->SetTitle( str );
         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)
 
     /* local buffer in multibyte form */
     /* 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)
 
     /* local buffer in multibyte form */

-    char buf[200];
-    strcpy( buf, "/" );
-    strcat( buf, str.mb_str() );
-    
+    wxString buf;
+    buf << _T('/') << str.c_str();
+
+    char *cbuf = new char[buf.Length()];
+    strcpy(cbuf, buf.mbc_str());
+

     GtkItemFactoryEntry entry;
     GtkItemFactoryEntry entry;

-    entry.path = buf;
+    entry.path = (gchar *)cbuf;  // const_cast

     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
     entry.item_type = "<Branch>";
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
     entry.item_type = "<Branch>";

-    
+

     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     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 tmp = _T("<main>/");
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     wxString tmp = _T("<main>/");

-    for ( const wxChar *pc = str; *pc != _T('\0'); pc++ )
+    for ( pc = str; *pc != _T('\0'); pc++ )

     {
     {

-        if (*pc == _T('_')) pc++; /* skip it */
-        tmp << *pc;
+       if (*pc == _T('_')) pc++; /* skip it */
+       tmp << *pc;

     }
     }

-    

     menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
     menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );

-    

     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );

-    
+    delete [] cbuf;

 #else
 
     menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
 #else
 
     menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );


@@ -239,7 +242,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 );
     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
 }
 
 #endif
 }
 


@@ -498,15 +501,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 

-/*   wxMSW doesn't call callback here either
-
-     if (menu->m_callback)
-     {
-        (void) (*(menu->m_callback)) (*menu, event);
-        return;
-     }
-*/
-

     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 


@@ -565,19 +559,19 @@ void wxMenuItem::SetName( const wxString& str )
     for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
     {
         if (*pc == _T('&'))
     for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
     {
         if (*pc == _T('&'))

-       {
+        {

 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');
 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');

-        } else 
-       if (*pc == _T('/'))      /* we have to filter out slashes ... */
-       {
+        } else
+        if (*pc == _T('/'))      /* we have to filter out slashes ... */
+        {

             m_text << _T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
            m_text << *pc;
     }
             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)
     /* only GTK 1.2 knows about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)


@@ -632,21 +626,31 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 

-wxMenu::wxMenu( const wxString& title, const wxFunction func )
+void
+wxMenu::Init( const wxString& title,
+              long style
+#ifdef WXWIN_COMPATIBILITY
+              , const wxFunction func
+#endif
+              )

 {
     m_title = title;
     m_items.DeleteContents( TRUE );
     m_invokingWindow = (wxWindow *) NULL;
 {
     m_title = title;
     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>" );
 #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
 
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 

+#ifdef WXWIN_COMPATIBILITY

     m_callback = func;
     m_callback = func;

+#endif
+

     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 


@@ -658,11 +662,30 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
     }
 
     m_owner = (GtkWidget*) NULL;
     }
 
     m_owner = (GtkWidget*) NULL;

+
+#if (GTK_MINOR_VERSION > 0)
+    /* Tearoffs are entries, just like separators. So if we want this
+       menu to be a tear-off one, we just append a tearoff entry
+       immediately. */
+    if(m_style & wxMENU_TEAROFF)
+    {
+       GtkItemFactoryEntry entry;
+       entry.path = "/tearoff";
+       entry.callback = (GtkItemFactoryCallback) NULL;
+       entry.callback_action = 0;
+       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" );
+    }
+#endif

 }
 
 wxMenu::~wxMenu()
 {
 }
 
 wxMenu::~wxMenu()
 {

-    /* how do we delete an item-factory ? */
+   /* how do we delete an item-factory ? */
+   gtk_widget_destroy( m_menu );
+

 }
 
 void wxMenu::SetTitle( const wxString& title )
 }
 
 void wxMenu::SetTitle( const wxString& title )


@@ -688,9 +711,9 @@ void wxMenu::AppendSeparator()
     entry.callback_action = 0;
     entry.item_type = "<Separator>";
     entry.accelerator = (gchar*) NULL;
     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 ? */
     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
     /* this will be wrong for more than one separator. do we care? */
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
 #else


@@ -698,7 +721,7 @@ void wxMenu::AppendSeparator()
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
 #endif
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
 #endif

-    
+

     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }


@@ -706,37 +729,37 @@ void wxMenu::AppendSeparator()
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;

-    
+

     switch (hotkey[0])
     {
         case _T('a'):   /* Alt */
     switch (hotkey[0])
     {
         case _T('a'):   /* Alt */

-       case _T('A'):
-       case _T('m'):   /* Meta */
-       case _T('M'):
-       {
-           strcpy( hotbuf, "<alt>" );
-           wxString last = hotkey.Right(1);
-           strcat( hotbuf, last.mb_str() );
+        case _T('A'):
+        case _T('m'):   /* Meta */
+        case _T('M'):
+        {
+            strcpy( hotbuf, "<alt>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );

             return hotbuf;
             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() );
+        }
+        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;
         }
             return hotbuf;
         }

-       case _T('F'):   /* function keys */
-       {
-           strcpy( hotbuf, hotkey.mb_str() );
+        case _T('F'):   /* function keys */
+        {
+            strcpy( hotbuf, hotkey.mb_str() );

             return hotbuf;
             return hotbuf;

-       }
-       default:
-       {
-       }
+        }
+        default:
+        {
+        }

     }
     return (char*) NULL;
 }
     }
     return (char*) NULL;
 }


@@ -748,16 +771,16 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);

-    
+

 #if (GTK_MINOR_VERSION > 0)
 #if (GTK_MINOR_VERSION > 0)

-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* text has "_" instead of "&" after mitem->SetText() */

     wxString text( mitem->GetText() );
     wxString text( mitem->GetText() );

-    
+

     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
     /* 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;
     GtkItemFactoryEntry entry;
     entry.path = buf;
     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;


@@ -766,12 +789,12 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         entry.item_type = "<CheckItem>";
     else
         entry.item_type = "<Item>";
         entry.item_type = "<CheckItem>";
     else
         entry.item_type = "<Item>";

-    
+

     char hotbuf[50];
     entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
     char hotbuf[50];
     entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );

-    
+

     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     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++ )
     /* 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++ )


@@ -779,21 +802,21 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }

-    
+

     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
     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() );
 #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_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 );
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );

-    
+

 #endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
 #endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",


@@ -817,22 +840,22 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     mitem->SetHelp(helpStr);
 
 #if (GTK_MINOR_VERSION > 0)
     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() );
     wxString text( mitem->GetText() );

-    
+

     /* local buffer in multibyte form */
     char buf[200];
     strcpy( buf, "/" );
     strcat( buf, text.mb_str() );
     /* 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>";
     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 ? */
     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++ )
     /* 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++ )


@@ -840,17 +863,17 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
         if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }

-    
+

     GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
     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());
 #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 );
     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),
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),


@@ -861,7 +884,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 );
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );

-    
+

     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 
     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 


@@ -911,8 +934,8 @@ int wxMenu::FindItem( const wxString itemString ) const
     for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
     {
         if (*pc == _T('&'))
     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
 #if (GTK_MINOR_VERSION > 0)
             s << _T('_');
 #endif