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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -566,7 +566,8 @@ MSW_HEADERS = \
 		msw/xpmhand.h
 
 UNIX_HEADERS = \
-		unix/execute.h
+		unix/execute.h \
+		unix/fontutil.h
 
 GENERIC_HEADERS = \
 		generic/caret.h \

samples/controls/controls.cpp

@@ -210,10 +210,19 @@ enum
 
 bool MyApp::OnInit()
 {
+    // parse the cmd line
+    int x = 50,
+        y = 50;
+    if ( argc == 2 )
+    {
+        wxSscanf(argv[1], "%d", &x);
+        wxSscanf(argv[2], "%d", &y);
+    }
+
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
-            50, 50, 530, 420);
+            x, y, 530, 420);
 
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows
@@ -705,6 +714,8 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
+    GetParent()->Move(100, 100);
+
     wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
                                                      : m_listboxSorted;
 

samples/grid/Makefile.am

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

samples/help/Makefile.am

@@ -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

samples/help/Makefile.in

@@ -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
+
+

samples/help/demo.cpp

@@ -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
+    // initialise the help system: this means that we'll use doc.hlp file under
-    // application would exit immediately.
+    // 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");
 }
 
 

samples/joytest/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = joytest
-
-joytest_SOURCES = joytest.cpp

samples/memcheck/Makefile.am

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

samples/menu/menu.cpp

@@ -556,7 +556,7 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
     menu.AppendSeparator();
     menu.Append(Menu_File_Quit, "E&xit");
 
-    menu.Delete(Menu_Popup_ToBeDeleted);
+    //menu.Delete(Menu_Popup_ToBeDeleted);
     menu.Check(Menu_Popup_ToBeChecked, TRUE);
     menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
 

samples/mfc/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = mfctest
-
-mfctest_SOURCES = mfctest.cpp

samples/nativdlg/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = nativdlg
-
-nativdlg_SOURCES = nativdlg.cpp

samples/oleauto/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = oleauto
-
-oleauto_SOURCES = oleauto.cpp

samples/ownerdrw/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = ownerdrw
-
-ownerdrw_SOURCES = ownerdrw.cpp

samples/regtest/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = regtest
-
-regtest_SOURCES = regtest.cpp

samples/richedit/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = wxLayout
-
-wxLayout_SOURCES = wxLayout.cpp kbList.cpp wxllist.cpp wxlparser.cpp wxlwindow.cpp

samples/tab/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = test
-
-test_SOURCES = test.cpp

samples/taskbar/Makefile.am

@@ -1,7 +0,0 @@
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = tbtest
-
-tbtest_SOURCES = tbtest.cpp

samples/text/text.cpp

@@ -126,6 +126,7 @@ public:
     void OnMoveToEndOfEntry( wxCommandEvent &event )
         { m_panel->DoMoveToEndOfEntry(); }
 
+    void OnLogClear(wxCommandEvent& event);
     void OnFileLoad(wxCommandEvent& event);
 
     void OnIdle( wxIdleEvent& event );
@@ -151,6 +152,7 @@ enum
     TEXT_QUIT = 100,
     TEXT_ABOUT,
     TEXT_LOAD,
+    TEXT_CLEAR,
 
     // clipboard menu
     TEXT_CLIPBOARD_COPY = 200,
@@ -173,6 +175,8 @@ bool MyApp::OnInit()
     frame->SetSizeHints( 500, 400 );
 
     wxMenu *file_menu = new wxMenu;
+    file_menu->Append(TEXT_CLEAR, "&Clear the log\tCtrl-C",
+                      "Clear the log window contents");
     file_menu->Append(TEXT_LOAD, "&Load file\tCtrl-O",
                       "Load the sample file into text control");
     file_menu->AppendSeparator();
@@ -601,6 +605,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_QUIT,   MyFrame::OnQuit)
     EVT_MENU(TEXT_ABOUT,  MyFrame::OnAbout)
     EVT_MENU(TEXT_LOAD,   MyFrame::OnFileLoad)
+    EVT_MENU(TEXT_CLEAR,  MyFrame::OnLogClear)
 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)
@@ -633,6 +638,9 @@ void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
+    SetSize(40, 40, 200, 200);
+    return;
+
     wxBeginBusyCursor();
 
     wxMessageDialog dialog(this,
@@ -683,6 +691,11 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
 }
 #endif // tooltips
 
+void MyFrame::OnLogClear(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->m_log->Clear();
+}
+
 void MyFrame::OnFileLoad(wxCommandEvent& event)
 {
     if ( m_panel->m_multitext->LoadFile("text.rc") )