From: drowe67 Date: Tue, 20 Nov 2012 08:44:30 +0000 (+0000) Subject: testing adding svn revision to about X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=aa5fcfe54ba556903f29cc41647f191f24052cc7;p=freetel-svn-tracking.git testing adding svn revision to about git-svn-id: https://svn.code.sf.net/p/freetel/code@1035 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux index 0bd97661..20adc981 100644 --- a/fdmdv2/src/Makefile.linux +++ b/fdmdv2/src/Makefile.linux @@ -11,10 +11,11 @@ CODEC2_PATH=/home/david/codec2-dev WX_CONFIG=$(WX_GTK_PATH)/wx-config WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv) +SVN_REVISION = $(shell svnversion) CODEC2_INC=-I$(CODEC2_PATH)/src CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a -CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 +CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 -DSVN_REV=$(SVN_REVISION) LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lpthread -lsndfile /usr/lib/libsamplerate.so.0 OBJS = topFrame.o \ diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index d4d6a24a..5fb274ff 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -1108,15 +1108,11 @@ void MainFrame::OnHelpCheckUpdatesUI(wxUpdateUIEvent& event) //------------------------------------------------------------------------- void MainFrame::OnHelpAbout(wxCommandEvent& event) { - wxUnusedVar(event); -// int rv = 0; -// AboutDlg *dlg = new AboutDlg(NULL); -// rv = dlg->ShowModal(); -// if(rv == wxID_OK) -// { -// dlg->ExchangeData(EXCHANGE_DATA_OUT); -// } -// delete dlg; + wxString msg; + msg.Printf( wxT("This is the About dialog of the sound sample.\n") + wxT("Welcome to %s"), wxVERSION_STRING); + + wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this); } /*