From 8a5137d74ab4f665603d8c8c6518ad4464fc8917 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Fri, 13 Aug 1999 19:39:15 +0000
Subject: [PATCH] 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
---
configure.in | 8 ++++++++
samples/image/image.cpp | 4 +---
samples/sashtest/.cvsignore | 1 -
samples/sashtest/Makefile.am | 9 ---------
samples/sashtest/{makefile.unx => Makefile.in} | 3 +++
samples/scroll/.cvsignore | 1 -
samples/scroll/Makefile.am | 9 ---------
samples/scroll/{makefile.unx => Makefile.in} | 3 +++
samples/splitter/.cvsignore | 1 -
samples/splitter/Makefile.am | 9 ---------
samples/splitter/{makefile.unx => Makefile.in} | 3 +++
samples/text/.cvsignore | 1 -
samples/text/Makefile.am | 9 ---------
samples/text/{makefile.unx => Makefile.in} | 3 +++
samples/thread/.cvsignore | 1 -
samples/thread/Makefile.am | 9 ---------
samples/thread/{makefile.unx => Makefile.in} | 3 +++
samples/toolbar/.cvsignore | 1 -
samples/toolbar/Makefile.am | 9 ---------
samples/toolbar/{makefile.unx => Makefile.in} | 3 +++
samples/treectrl/.cvsignore | 1 -
samples/treectrl/Makefile.am | 9 ---------
samples/treectrl/{makefile.unx => Makefile.in} | 3 +++
samples/typetest/.cvsignore | 1 -
samples/typetest/Makefile.am | 9 ---------
samples/typetest/{makefile.unx => Makefile.in} | 3 +++
src/common/dlgcmn.cpp | 10 ++++++++++
src/generic/msgdlgg.cpp | 2 +-
src/make.env.in | 6 ------
29 files changed, 44 insertions(+), 90 deletions(-)
delete mode 100644 samples/sashtest/Makefile.am
rename samples/sashtest/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/scroll/Makefile.am
rename samples/scroll/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/splitter/Makefile.am
rename samples/splitter/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/text/Makefile.am
rename samples/text/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/thread/Makefile.am
rename samples/thread/{makefile.unx => Makefile.in} (82%)
delete mode 100644 samples/toolbar/Makefile.am
rename samples/toolbar/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/treectrl/Makefile.am
rename samples/treectrl/{makefile.unx => Makefile.in} (83%)
delete mode 100644 samples/typetest/Makefile.am
rename samples/typetest/{makefile.unx => Makefile.in} (83%)
diff --git a/configure.in b/configure.in
index b2301bdf82..0cb0a3d49e 100644
--- 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 63e3ab54a7..30bb7eb986 100644
--- 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 f5eaa1a859..8b13789179 100644
--- 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
index f2bbd260b1..0000000000
--- 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.unx b/samples/sashtest/Makefile.in
similarity index 83%
rename from samples/sashtest/makefile.unx
rename to samples/sashtest/Makefile.in
index 1b3cff37d5..c54949ede8 100644
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for sashtest example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=sashtest
OBJECTS=$(PROGRAM).o
diff --git a/samples/scroll/.cvsignore b/samples/scroll/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 162ff86f4a..0000000000
--- 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.unx b/samples/scroll/Makefile.in
similarity index 83%
rename from samples/scroll/makefile.unx
rename to samples/scroll/Makefile.in
index 9f0381fbbb..7a2e94e208 100644
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for scroll example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=scroll
OBJECTS=$(PROGRAM).o
diff --git a/samples/splitter/.cvsignore b/samples/splitter/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 3631656b63..0000000000
--- 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.unx b/samples/splitter/Makefile.in
similarity index 83%
rename from samples/splitter/makefile.unx
rename to samples/splitter/Makefile.in
index 49afaf4cdd..4ab0aea227 100644
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for splitter example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=test
OBJECTS=$(PROGRAM).o
diff --git a/samples/text/.cvsignore b/samples/text/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 9458f8f5c8..0000000000
--- 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.unx b/samples/text/Makefile.in
similarity index 83%
rename from samples/text/makefile.unx
rename to samples/text/Makefile.in
index 8e5eeb17a1..f0a4715d75 100644
--- a/samples/text/makefile.unx
+++ b/samples/text/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for controls example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=controls
OBJECTS=$(PROGRAM).o
diff --git a/samples/thread/.cvsignore b/samples/thread/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 3631656b63..0000000000
--- 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.unx b/samples/thread/Makefile.in
similarity index 82%
rename from samples/thread/makefile.unx
rename to samples/thread/Makefile.in
index 14a225e23c..c5e925a5b9 100644
--- a/samples/thread/makefile.unx
+++ b/samples/thread/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for thread example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=test
OBJECTS=$(PROGRAM).o
diff --git a/samples/toolbar/.cvsignore b/samples/toolbar/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 3631656b63..0000000000
--- 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.unx b/samples/toolbar/Makefile.in
similarity index 83%
rename from samples/toolbar/makefile.unx
rename to samples/toolbar/Makefile.in
index 0b249d4c88..0e0ce03472 100644
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for toolbar example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=test
OBJECTS=$(PROGRAM).o
diff --git a/samples/treectrl/.cvsignore b/samples/treectrl/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 2812685365..0000000000
--- 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.unx b/samples/treectrl/Makefile.in
similarity index 83%
rename from samples/treectrl/makefile.unx
rename to samples/treectrl/Makefile.in
index aa0c92a4ad..df8080f5dc 100644
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for treectrl example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=treetest
OBJECTS=$(PROGRAM).o
diff --git a/samples/typetest/.cvsignore b/samples/typetest/.cvsignore
index f5eaa1a859..8b13789179 100644
--- 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
index 48f57ce02d..0000000000
--- 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.unx b/samples/typetest/Makefile.in
similarity index 83%
rename from samples/typetest/makefile.unx
rename to samples/typetest/Makefile.in
index 44f21e1899..2cc3a6bab2 100644
--- a/samples/typetest/makefile.unx
+++ b/samples/typetest/Makefile.in
@@ -9,6 +9,9 @@
#
# Makefile for typetest example (UNIX).
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
PROGRAM=typetest
OBJECTS=$(PROGRAM).o
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index f9d62a3b2f..9f74bbe3af 100644
--- 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 e693f4eade..06450f44a0 100644
--- 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 c3127caccb..cc707b429c 100644
--- 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
--
2.45.2