Added PNM image handler

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index b41ead44f43df73fe0b63816993e8e7b9aaa2cf5..e1d680563e3e018ebd5246759ffa44695b94d34f 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -224,7 +224,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     wxString buf;
     buf << _T('/') << str.c_str();
 
-    char *cbuf = new char[buf.Length()];
+    char *cbuf = new char[buf.Length()+1];
     strcpy(cbuf, buf.mbc_str());
 
     GtkItemFactoryEntry entry;
@@ -638,11 +638,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void
 wxMenu::Init( const wxString& title,
-              long style
-#ifdef WXWIN_COMPATIBILITY
-              , const wxFunction func
-#endif
-              )
+              long style,
+             const wxFunction func
+             )
 {
     m_title = title;
     m_items.DeleteContents( TRUE );
@@ -657,9 +655,7 @@ wxMenu::Init( const wxString& title,
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
-#ifdef WXWIN_COMPATIBILITY
     m_callback = func;
-#endif
 
     m_eventHandler = this;
     m_clientData = (void*) NULL;
@@ -736,6 +732,7 @@ void wxMenu::AppendSeparator()
     m_items.Append( mitem );
 }
 
+#if (GTK_MINOR_VERSION > 0)
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;
@@ -773,6 +770,7 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
     }
     return (char*) NULL;
 }
+#endif
 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {