From 6fbf0513e066b12e395c9c93ba6b3dc88673700a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 17 Dec 1998 15:46:50 +0000 Subject: [PATCH] GTK is standard in configure again removed warning from postscript dc compile fix for wxDirDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 2 +- configure.in | 2 +- src/gtk/dcps.cpp | 9 +++++++-- src/gtk/dirdlg.cpp | 2 +- src/gtk1/dcps.cpp | 9 +++++++-- src/gtk1/dirdlg.cpp | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 7aca4c2ffa..347b49f2f3 100755 --- a/configure +++ b/configure @@ -4524,7 +4524,7 @@ touch ${OSTYPE}.system.cache.tmp touch ${OSTYPE}.system.cache -DEFAULT_wxUSE_GTK=0 +DEFAULT_wxUSE_GTK=1 DEFAULT_wxUSE_QT=0 DEFAULT_wxUSE_MOTIF=0 diff --git a/configure.in b/configure.in index 6baea894c1..ed5e745cc9 100644 --- a/configure.in +++ b/configure.in @@ -671,7 +671,7 @@ dnl ------------------------------------------------------------------------ AC_OVERRIDES_PREPARE -DEFAULT_wxUSE_GTK=0 +DEFAULT_wxUSE_GTK=1 DEFAULT_wxUSE_QT=0 DEFAULT_wxUSE_MOTIF=0 diff --git a/src/gtk/dcps.cpp b/src/gtk/dcps.cpp index 6812fe95b4..275e0d1b35 100644 --- a/src/gtk/dcps.cpp +++ b/src/gtk/dcps.cpp @@ -1349,11 +1349,16 @@ void wxPostScriptDC::EndPage () *m_pstream << "showpage\n"; } -bool wxPostScriptDC::Blit (long xdest, long ydest, long fwidth, long fheight, - wxDC *source, long xsrc, long ysrc, int WXUNUSED(rop), bool WXUNUSED(useMask)) +bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest), + long WXUNUSED(fwidth), long WXUNUSED(fheight), + wxDC *WXUNUSED(source), + long WXUNUSED(xsrc), long WXUNUSED(ysrc), + int WXUNUSED(rop), bool WXUNUSED(useMask) ) { wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); + wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." ); + return TRUE; } diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index 3a9ea7e96d..cebccbcb6d 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -113,7 +113,7 @@ wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUN const wxPoint& pos, const wxSize& size, const long style, const wxString& name ) : - wxTreeCtrl( parent, id, pos, size, style, name ) + wxTreeCtrl( parent, id, pos, size, style, wxDefaultValidator, name ) { m_imageListNormal = new wxImageList(16, 16, TRUE); m_imageListNormal->Add(wxICON(icon1)); diff --git a/src/gtk1/dcps.cpp b/src/gtk1/dcps.cpp index 6812fe95b4..275e0d1b35 100644 --- a/src/gtk1/dcps.cpp +++ b/src/gtk1/dcps.cpp @@ -1349,11 +1349,16 @@ void wxPostScriptDC::EndPage () *m_pstream << "showpage\n"; } -bool wxPostScriptDC::Blit (long xdest, long ydest, long fwidth, long fheight, - wxDC *source, long xsrc, long ysrc, int WXUNUSED(rop), bool WXUNUSED(useMask)) +bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest), + long WXUNUSED(fwidth), long WXUNUSED(fheight), + wxDC *WXUNUSED(source), + long WXUNUSED(xsrc), long WXUNUSED(ysrc), + int WXUNUSED(rop), bool WXUNUSED(useMask) ) { wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); + wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." ); + return TRUE; } diff --git a/src/gtk1/dirdlg.cpp b/src/gtk1/dirdlg.cpp index 3a9ea7e96d..cebccbcb6d 100644 --- a/src/gtk1/dirdlg.cpp +++ b/src/gtk1/dirdlg.cpp @@ -113,7 +113,7 @@ wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUN const wxPoint& pos, const wxSize& size, const long style, const wxString& name ) : - wxTreeCtrl( parent, id, pos, size, style, name ) + wxTreeCtrl( parent, id, pos, size, style, wxDefaultValidator, name ) { m_imageListNormal = new wxImageList(16, 16, TRUE); m_imageListNormal->Add(wxICON(icon1)); -- 2.45.2