Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing Makefile.ams (and minor additions/fixes to the samples)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-08 15:06:41 +00:00
parent ac99a98ff0
commit e66ad5c68d
18 changed files with 66 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/help/Makefile.am
View File

@@ -1,9 +0,0 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
noinst_PROGRAMS = demo
demo_SOURCES = demo.cpp

24
samples/help/Makefile.in Normal file
View File

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

23
samples/help/demo.cpp
View File

@@ -71,6 +71,8 @@ public:
// ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
wxHelpController& GetHelpController() { return m_help; }
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event);
@@ -147,9 +149,17 @@ bool MyApp::OnInit()
frame->Show(TRUE);
SetTopWindow(frame);
// success: wxApp::OnRun() will be called which will enter the main message
// loop and the application will run. If we returned FALSE here, the
// application would exit immediately.
// initialise the help system: this means that we'll use doc.hlp file under
// Windows and that the HTML docs are in the subdirectory doc for platforms
// using HTML help
if ( !frame->GetHelpController().Initialize("doc") )
{
wxLogError("Cannot initialize the help system, aborting.");
return FALSE;
}
return TRUE;
}
@@ -174,7 +184,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Help_Search, "&Search help...");
#ifndef __WXMSW__
#ifndef wxUSE_HTML
#if !wxUSE_HTML
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Help_KDE, "Use &KDE");
menuFile->Append(HelpDemo_Help_GNOME, "Use &GNOME");
@@ -203,11 +213,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// and a static control whose parent is the panel
(void)new wxStaticText(panel, -1, "Hello, world!", wxPoint(10, 10));
// initialise the help system: this means that we'll use doc.hlp file under
// Windows and that the HTML docs are in the subdirectory doc for platforms
// using HTML help
m_help.Initialize("doc");
}