wxGTK compiles (and seems to work) again after wxMenu changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-02 15:21:40 +00:00
parent b86737ee11
commit 1987af7e9f
12 changed files with 126 additions and 95 deletions

21
samples/menu/Makefile.in Normal file
View File

@@ -0,0 +1,21 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for minimal example (UNIX).
top_srcdir = @top_srcdir@
top_builddir = ../..
program_dir = samples/menu
PROGRAM=menu
OBJECTS=$(PROGRAM).o
include ../../src/makeprog.env

View File

@@ -313,7 +313,7 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAppendMenu(wxCommandEvent& WXUNUSED(event))
{
static s_count = 0;
static int s_count = 0;
wxString title;
title.Printf("Dummy menu &%d", ++s_count);
@@ -354,7 +354,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
size_t count = mbar->GetMenuCount();
wxLogMessage("The label of the last menu item is '%s'",
mbar->GetLabelTop(count - 1));
mbar->GetLabelTop(count - 1).c_str());
}
void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
@@ -448,7 +448,7 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
if ( item )
{
wxLogMessage("The label of the last menu item is '%s'",
item->GetLabel());
item->GetLabel().c_str());
}
}