Fixed wxPostScript printing problem (used wrong constructor, and the right

one was wrong anyway...) Fixed include dir ordering in wxMotif makefiles (wrong version of zlib.h picked up) and added wxchar.cpp to Motif makefile. Changed buffer.h since there's no wchar.h on my system.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 5d1b17da2862f084e7d0a0da6f53ea243826023a..72b1df566e1e905452f92b2300f2deec405cfea2 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -29,6 +29,7 @@ rm -f $2/tex2rtf2.tgz
 rm -f $2/ogl3.tgz
 rm -f $2/treedraw.tar.gz
 rm -f $2/glcanvas.tar.gz
 rm -f $2/ogl3.tgz
 rm -f $2/treedraw.tar.gz
 rm -f $2/glcanvas.tar.gz

+rm -f $2/jpeg.tgz

 
 echo Tarring...
 
 
 echo Tarring...
 


@@ -98,4 +99,10 @@ tar cvf $2/treedraw.tar -T /tmp/wxtree.txt
 gzip $2/treedraw.tar
 mv $2/treedraw.tar.gz $2/treedraw.tgz
 
 gzip $2/treedraw.tar
 mv $2/treedraw.tar.gz $2/treedraw.tgz
 

+### JPEG
+ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
+tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
+gzip $2/jpeg.tar
+mv $2/jpeg.tar.gz $2/jpeg.tgz
+

 echo Done!
 echo Done!

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index a1547764c71c1f3264ad9782ba97f990fcab09ad..9bed7fca305a06c4bfdeadec200b4410ded4eba2 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -17,6 +17,13 @@
 #include "wx/wxchar.h"
 #include <string.h> // strdup
 
 #include "wx/wxchar.h"
 #include <string.h> // strdup
 

+// wchar.h isn't available on my system (Linux, g++ 2.7.2). JACS.
+#ifdef __LINUX__
+#include <wcstr.h>
+#else
+#include <wchar.h>  // wchar_t
+#endif
+

 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
 // of new/delete
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
 // of new/delete

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 64244a8a0096b64d58da2aa19e5981993f42b98f..a4db60f67e36fe77112b4c09e7574533e349a026 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -42,7 +42,7 @@ class DnDText : public wxTextDropTarget
 public:
   DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 public:
   DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-  virtual bool OnDropText(int x, int y, const char *psz );
+  virtual bool OnDropText(long x, long y, const char *psz );

 
 private:
   wxListBox *m_pOwner;
 
 private:
   wxListBox *m_pOwner;


@@ -53,7 +53,7 @@ class DnDFile : public wxFileDropTarget
 public:
   DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 public:
   DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-  virtual bool OnDropFiles(int x, int y,
+  virtual bool OnDropFiles(long x, long y,

                            size_t nFiles, const char * const aszFiles[] );
 
 private:
                            size_t nFiles, const char * const aszFiles[] );
 
 private:


@@ -349,14 +349,14 @@ DnDFrame::~DnDFrame()
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------

-bool DnDText::OnDropText(int, int, const char *psz)
+bool DnDText::OnDropText(long, long, const char *psz)

 {
   m_pOwner->Append(psz);
 
   return TRUE;
 }
 
 {
   m_pOwner->Append(psz);
 
   return TRUE;
 }
 

-bool DnDFile::OnDropFiles(int, int, size_t nFiles,
+bool DnDFile::OnDropFiles(long, long, size_t nFiles,

                           const char * const aszFiles[])
 {
   wxString str;
                           const char * const aszFiles[])
 {
   wxString str;

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index a611e4881de38d88459678a02f2b5ebc0e275b81..9428174dc05f67cbc79e38c53d8b41c1f27c1418 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -315,6 +315,8 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
     m_signY = -1;  // default y-axis bottom up -> top down
 
     m_printData = printData;
     m_signY = -1;  // default y-axis bottom up -> top down
 
     m_printData = printData;

+
+    m_ok = TRUE;

 }
 
 wxPostScriptDC::~wxPostScriptDC ()
 }
 
 wxPostScriptDC::~wxPostScriptDC ()

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 6270c0f62f811b2ec1cc103b762bc68147cd7ffd..de944fc343fccc7f5b1f4fe150b963f6430d315a 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -242,7 +242,10 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxThePrintSetupData->SetPrinterFile(f);
     }
     else
         wxThePrintSetupData->SetPrinterFile(f);
     }
     else

+    {
+        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);

         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);
         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);

+    }

 
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }


@@ -354,7 +357,8 @@ TODO: collate and noCopies should be duplicated across dialog data and print dat
 
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {
 
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {

-    return new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
+  //    return new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
+  return new wxPostScriptDC(GetPrintDialogData().GetPrintData());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/make.env b/src/make.env
index 8bbc6e78ed4b224e3c36c383415695face643196..7df2eca3cfc210f099c5c6f706f0d28068144165 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -77,8 +77,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 

diff --git a/src/makeenvs/linux.env b/src/makeenvs/linux.env
index 8bbc6e78ed4b224e3c36c383415695face643196..7df2eca3cfc210f099c5c6f706f0d28068144165 100644 (file)
--- a/src/makeenvs/linux.env
+++ b/src/makeenvs/linux.env
@@ -77,8 +77,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 

diff --git a/src/makeenvs/sgi.env b/src/makeenvs/sgi.env
index e1d1b2fd13db4c3a52e10048e2413a1fa9e6d565..b16923a70805d6540114aaa6f76ca7cd49d8dd56 100644 (file)
--- a/src/makeenvs/sgi.env
+++ b/src/makeenvs/sgi.env
@@ -77,8 +77,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 

diff --git a/src/makeenvs/solaris.env b/src/makeenvs/solaris.env
index 3b7c52adbba18435e947d3eb2bb1f0f85819fe48..00abd382a90fd3e2981f0eec70a6ab9ad1f0cc15 100644 (file)
--- a/src/makeenvs/solaris.env
+++ b/src/makeenvs/solaris.env
@@ -77,8 +77,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index 182f91062cf55c3141550d4b204e85e198570d5f..b664579b1927f4f1dc8e3fa858611e52b07f694a 100644 (file)
--- a/src/motif/makefile.unx
+++ b/src/motif/makefile.unx
@@ -67,6 +67,7 @@ LIB_CPP_SRC=\
  ../common/valtext.cpp \
  ../common/variant.cpp \
  ../common/wxexpr.cpp \
  ../common/valtext.cpp \
  ../common/variant.cpp \
  ../common/wxexpr.cpp \

+ ../common/wxchar.cpp \

  ../common/socket.cpp \
  ../common/sckaddr.cpp \
  ../common/sckipc.cpp \
  ../common/socket.cpp \
  ../common/sckaddr.cpp \
  ../common/sckipc.cpp \