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

diff --git a/configure.in b/configure.in
index b2301bdf828808c86c3607a2ed52294f1c45d9af..0cb0a3d49ec88273bafaa73618c15d8b99cb6014 100644 (file)
--- 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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 63e3ab54a7dbdefc7421140b7429067f2044746a..30bb7eb986d92c1aafde8f1c4c1ce5df337cbbed 100644 (file)
--- 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 );
 }

diff --git a/samples/sashtest/.cvsignore b/samples/sashtest/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/sashtest/.cvsignore
+++ b/samples/sashtest/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/sashtest/Makefile.am b/samples/sashtest/Makefile.am
deleted file mode 100644 (file)
index f2bbd26..0000000
--- a/samples/sashtest/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
new file mode 100644 (file)
index 0000000..c54949e
--- /dev/null
+++ b/samples/sashtest/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for sashtest example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=sashtest
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx
deleted file mode 100644 (file)
index 1b3cff3..0000000
--- a/samples/sashtest/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for sashtest example (UNIX).
-
-PROGRAM=sashtest
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/scroll/.cvsignore b/samples/scroll/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/scroll/.cvsignore
+++ b/samples/scroll/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/scroll/Makefile.am b/samples/scroll/Makefile.am
deleted file mode 100644 (file)
index 162ff86..0000000
--- a/samples/scroll/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
new file mode 100644 (file)
index 0000000..7a2e94e
--- /dev/null
+++ b/samples/scroll/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for scroll example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=scroll
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
deleted file mode 100644 (file)
index 9f0381f..0000000
--- a/samples/scroll/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for scroll example (UNIX).
-
-PROGRAM=scroll
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/splitter/.cvsignore b/samples/splitter/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/splitter/.cvsignore
+++ b/samples/splitter/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/splitter/Makefile.am b/samples/splitter/Makefile.am
deleted file mode 100644 (file)
index 3631656..0000000
--- a/samples/splitter/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
new file mode 100644 (file)
index 0000000..4ab0aea
--- /dev/null
+++ b/samples/splitter/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for splitter example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=test
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+
+

diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx
deleted file mode 100644 (file)
index 49afaf4..0000000
--- a/samples/splitter/makefile.unx
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for splitter example (UNIX).
-
-PROGRAM=test
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-
-

diff --git a/samples/text/.cvsignore b/samples/text/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/text/.cvsignore
+++ b/samples/text/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/text/Makefile.am b/samples/text/Makefile.am
deleted file mode 100644 (file)
index 9458f8f..0000000
--- a/samples/text/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
new file mode 100644 (file)
index 0000000..f0a4715
--- /dev/null
+++ b/samples/text/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for controls example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=controls
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx
deleted file mode 100644 (file)
index 8e5eeb1..0000000
--- a/samples/text/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for controls example (UNIX).
-
-PROGRAM=controls
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/thread/.cvsignore b/samples/thread/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/thread/.cvsignore
+++ b/samples/thread/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/thread/Makefile.am b/samples/thread/Makefile.am
deleted file mode 100644 (file)
index 3631656..0000000
--- a/samples/thread/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
new file mode 100644 (file)
index 0000000..c5e925a
--- /dev/null
+++ b/samples/thread/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for thread example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=test
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
deleted file mode 100644 (file)
index 14a225e..0000000
--- a/samples/thread/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for thread example (UNIX).
-
-PROGRAM=test
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/toolbar/.cvsignore b/samples/toolbar/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/toolbar/.cvsignore
+++ b/samples/toolbar/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/toolbar/Makefile.am b/samples/toolbar/Makefile.am
deleted file mode 100644 (file)
index 3631656..0000000
--- a/samples/toolbar/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
new file mode 100644 (file)
index 0000000..0e0ce03
--- /dev/null
+++ b/samples/toolbar/Makefile.in
@@ -0,0 +1,21 @@
+#
+# 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=test
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+
+

diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
deleted file mode 100644 (file)
index 0b249d4..0000000
--- a/samples/toolbar/makefile.unx
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for toolbar example (UNIX).
-
-PROGRAM=test
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-
-

diff --git a/samples/treectrl/.cvsignore b/samples/treectrl/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/treectrl/.cvsignore
+++ b/samples/treectrl/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/treectrl/Makefile.am b/samples/treectrl/Makefile.am
deleted file mode 100644 (file)
index 2812685..0000000
--- a/samples/treectrl/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
new file mode 100644 (file)
index 0000000..df8080f
--- /dev/null
+++ b/samples/treectrl/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for treectrl example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=treetest
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
deleted file mode 100644 (file)
index aa0c92a..0000000
--- a/samples/treectrl/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for treectrl example (UNIX).
-
-PROGRAM=treetest
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/typetest/.cvsignore b/samples/typetest/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/typetest/.cvsignore
+++ b/samples/typetest/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/typetest/Makefile.am b/samples/typetest/Makefile.am
deleted file mode 100644 (file)
index 48f57ce..0000000
--- a/samples/typetest/Makefile.am
+++ /dev/null
@@ -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

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
new file mode 100644 (file)
index 0000000..2cc3a6b
--- /dev/null
+++ b/samples/typetest/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for typetest example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=typetest
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx
deleted file mode 100644 (file)
index 44f21e1..0000000
--- a/samples/typetest/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for typetest example (UNIX).
-
-PROGRAM=typetest
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index f9d62a3b2f25981886c6f2e2c6dbde09c9119830..9f74bbe3af4888d05ecfc66ba832baf242a8d0b3 100644 (file)
--- 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
         {

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index e693f4eadef9ec0fb1a525e81a30072cc1138206..06450f44a0b5e077f52556f4231fabf30ea5374a 100644 (file)
--- 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 );

diff --git a/src/make.env.in b/src/make.env.in
index c3127caccbb5ac343b05aa7f1421919c08aa8be3..cc707b429c78a3f9709bdbf3236ae296da1ec242 100644 (file)
--- 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