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

diff --git a/configure b/configure
index 7aca4c2ffa0ef6b1c04e5527179bff7730f00f28..347b49f2f32b5ec72d6798dd025f6c914f859ef5 100755 (executable)
--- a/configure
+++ b/configure
@@ -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_MOTIF=0
 
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 

diff --git a/configure.in b/configure.in
index 6baea894c109098aa5ee2462d4d6554fdfab3f0e..ed5e745cc9c52475b3e3b35751a124fc6fc963e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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_MOTIF=0
 
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 

diff --git a/src/gtk/dcps.cpp b/src/gtk/dcps.cpp
index 6812fe95b4f4896e14ec568369c9d8e99c897af9..275e0d1b3532aba9c10b7ca70b5a8b27630149d4 100644 (file)
--- a/src/gtk/dcps.cpp
+++ b/src/gtk/dcps.cpp
@@ -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,
-      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" );
     
 {
     wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
     

+    wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." );
+    

     return TRUE;
 }
 
     return TRUE;
 }
 

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index 3a9ea7e96dae01f611de175d9558a918b393242f..cebccbcb6db36606d03b3e6533997ce2f449cebe 100644 (file)
--- 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 )
  :
             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));
 {
   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 6812fe95b4f4896e14ec568369c9d8e99c897af9..275e0d1b3532aba9c10b7ca70b5a8b27630149d4 100644 (file)
--- a/src/gtk1/dcps.cpp
+++ b/src/gtk1/dcps.cpp
@@ -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,
-      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" );
     
 {
     wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
     

+    wxFAIL_MSG( "wxPostScriptDC::Blit no yet implemented." );
+    

     return TRUE;
 }
 
     return TRUE;
 }
 

diff --git a/src/gtk1/dirdlg.cpp b/src/gtk1/dirdlg.cpp
index 3a9ea7e96dae01f611de175d9558a918b393242f..cebccbcb6db36606d03b3e6533997ce2f449cebe 100644 (file)
--- 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 )
  :
             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));
 {
   m_imageListNormal = new wxImageList(16, 16, TRUE);
   m_imageListNormal->Add(wxICON(icon1));