More makefiles

Corrected two thing in wxDialogBase (empty lines) and msgdlg (wrong flags) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-13 19:39:15 +00:00
parent ac15e21dc7
commit 8a5137d74a
29 changed files with 44 additions and 90 deletions
--- a/configure.in
+++ b/configure.in
@@ -2717,6 +2717,14 @@ AC_OUTPUT([
 	    samples/minimal/Makefile
 	    samples/notebook/Makefile
            samples/printing/Makefile
+	    samples/sashtest/Makefile
+	    samples/scroll/Makefile
+	    samples/splitter/Makefile
+	    samples/text/Makefile
+	    samples/thread/Makefile
+	    samples/toolbar/Makefile
+	    samples/treectrl/Makefile
+	    samples/typetest/Makefile
          ],
          [
            chmod +x wx-config
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -107,9 +107,6 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
  dc.DrawRectangle( 0, 0, 100, 100 );
  dc.SelectObject( wxNullBitmap );

-  dc.DrawText( "Loaded image", 30, 10 );
-  if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
-  
  // try to find the directory with our images
  wxString dir;
  if ( wxFile::Exists("./horse.png") )
@@ -278,6 +275,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
  (void)wxMessageBox( "wxImage demo\n"
+                      "\n"
                      "Robert Roebling (c) 1998",
                      "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }
--- a/samples/sashtest/.cvsignore
+++ b/samples/sashtest/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/sashtest/Makefile.am
+++ b/samples/sashtest/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = sashtest
-
-sashtest_SOURCES = sashtest.cpp
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for sashtest example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=sashtest

 OBJECTS=$(PROGRAM).o
--- a/samples/scroll/.cvsignore
+++ b/samples/scroll/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/scroll/Makefile.am
+++ b/samples/scroll/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = scroll
-
-scroll_SOURCES = scroll.cpp
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for scroll example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=scroll

 OBJECTS=$(PROGRAM).o
--- a/samples/splitter/.cvsignore
+++ b/samples/splitter/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/splitter/Makefile.am
+++ b/samples/splitter/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
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for splitter example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test

 OBJECTS=$(PROGRAM).o
--- a/samples/text/.cvsignore
+++ b/samples/text/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/text/Makefile.am
+++ b/samples/text/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = text
-
-text_SOURCES = text.cpp
--- a/samples/text/makefile.unx
+++ b/samples/text/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for controls example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=controls

 OBJECTS=$(PROGRAM).o
--- a/samples/thread/.cvsignore
+++ b/samples/thread/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/thread/Makefile.am
+++ b/samples/thread/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
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for thread example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test

 OBJECTS=$(PROGRAM).o
--- a/samples/toolbar/.cvsignore
+++ b/samples/toolbar/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/toolbar/Makefile.am
+++ b/samples/toolbar/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
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for toolbar example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test

 OBJECTS=$(PROGRAM).o
--- a/samples/treectrl/.cvsignore
+++ b/samples/treectrl/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/treectrl/Makefile.am
+++ b/samples/treectrl/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = treetest
-
-treetest_SOURCES = treetest.cpp
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for treectrl example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=treetest

 OBJECTS=$(PROGRAM).o
--- a/samples/typetest/.cvsignore
+++ b/samples/typetest/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/typetest/Makefile.am
+++ b/samples/typetest/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = typetest
-
-typetest_SOURCES = typetest.cpp
--- a/samples/typetest/makefile.unx
+++ b/samples/typetest/makefile.unx
@@ -9,6 +9,9 @@
 #
 # Makefile for typetest example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=typetest

 OBJECTS=$(PROGRAM).o
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -47,6 +47,12 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 {
    wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
    
+    // get line height for empty lines
+    int y = 0;
+    wxFont new_font( GetFont() );
+    if (!new_font.Ok()) new_font = *wxSWISS_FONT;
+    GetTextExtent( "H", (int*)NULL, &y, (int*)NULL, (int*)NULL, &new_font );
+    
    wxString line;
    for (size_t pos = 0; pos < message.Len(); pos++)
    {
@@ -58,6 +64,10 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 		box->Add( s1 );
                line = _T("");
            }
+	    else
+	    {
+	        box->Add( 5, y );
+	    }
        }
        else
        {
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -90,7 +90,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 #endif

    // 4) buttons
-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );

    topsizer->SetSizeHints( this );
    topsizer->Fit( this );
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -26,12 +26,6 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@

-########################### Misc #################################
-
-
-#@SHELL@ not supported by my autoconf version Is this really needed?
-#SHELL = @SHELL@
-SHELL=/bin/sh
 ########################### Programs #################################

 # C++ compiler