Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK is standard in configure again

Browse Source 
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
This commit is contained in:
Robert Roebling
1998-12-17 15:46:50 +00:00
parent ccfd0a25fe
commit 6fbf0513e0
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -4524,7 +4524,7 @@ touch ${OSTYPE}.system.cache.tmp
touch ${OSTYPE}.system.cache touch ${OSTYPE}.system.cache
DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_GTK=1
DEFAULT_wxUSE_QT=0 DEFAULT_wxUSE_QT=0
DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MOTIF=0

2
configure.in
View File

@@ -671,7 +671,7 @@ dnl ------------------------------------------------------------------------
AC_OVERRIDES_PREPARE AC_OVERRIDES_PREPARE
DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_GTK=1
DEFAULT_wxUSE_QT=0 DEFAULT_wxUSE_QT=0
DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MOTIF=0

9
src/gtk/dcps.cpp
View File

@@ -1349,11 +1349,16 @@ void wxPostScriptDC::EndPage ()
*m_pstream << "showpage\n"; *m_pstream << "showpage\n";
} }
bool wxPostScriptDC::Blit (long xdest, long ydest, long fwidth, long fheight, bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest),
wxDC *source, long xsrc, long ysrc, int WXUNUSED(rop), bool WXUNUSED(useMask)) 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" ); wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." );
return TRUE; return TRUE;
} }

2
src/gtk/dirdlg.cpp
View File

@@ -113,7 +113,7 @@ wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUN
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
const long style, const wxString& name ) 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 = new wxImageList(16, 16, TRUE);
m_imageListNormal->Add(wxICON(icon1)); m_imageListNormal->Add(wxICON(icon1));

9
src/gtk1/dcps.cpp
View File

@@ -1349,11 +1349,16 @@ void wxPostScriptDC::EndPage ()
*m_pstream << "showpage\n"; *m_pstream << "showpage\n";
} }
bool wxPostScriptDC::Blit (long xdest, long ydest, long fwidth, long fheight, bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest),
wxDC *source, long xsrc, long ysrc, int WXUNUSED(rop), bool WXUNUSED(useMask)) 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" ); wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." );
return TRUE; return TRUE;
} }

2
src/gtk1/dirdlg.cpp
View File

@@ -113,7 +113,7 @@ wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUN
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
const long style, const wxString& name ) 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 = new wxImageList(16, 16, TRUE);
m_imageListNormal->Add(wxICON(icon1)); m_imageListNormal->Add(wxICON(icon1));