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

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

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 );
 }

samples/sashtest/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/sashtest/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for sashtest example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=sashtest
 
 OBJECTS=$(PROGRAM).o

samples/scroll/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/scroll/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for scroll example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=scroll
 
 OBJECTS=$(PROGRAM).o

samples/splitter/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/splitter/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for splitter example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/text/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/text/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for controls example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=controls
 
 OBJECTS=$(PROGRAM).o

samples/thread/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/thread/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for thread example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/toolbar/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/toolbar/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for toolbar example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/treectrl/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/treectrl/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for treectrl example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=treetest
 
 OBJECTS=$(PROGRAM).o

samples/typetest/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/typetest/Makefile.in

@@ -9,6 +9,9 @@
 #
 # Makefile for typetest example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
 PROGRAM=typetest
 
 OBJECTS=$(PROGRAM).o

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
         {

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 );

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