Removed print.cpp, added tokenizr.tex

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

diff --git a/docs/latex/wx/tokenizr.tex b/docs/latex/wx/tokenizr.tex
new file mode 100644 (file)
index 0000000..69f398a
--- /dev/null
+++ b/docs/latex/wx/tokenizr.tex
@@ -0,0 +1,49 @@
+\section{\class{wxStringTokenizer}}\label{wxstringtokenizer}
+
+wxStringTokenizer helps you to break a string up into a number of tokens.
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxStringTokenizer::wxStringTokenizer}\label{wxstringtokenizerwxstringtokenizer}
+
+\func{}{wxStringTokenizer}{\param{const wxString\& }{to\_tokenize}, \param{const wxString\& }{delims = " \t\r\n"}, \param{bool }{ret\_delim = FALSE}}
+
+Constructor. Pass the string to tokenze, a string containing delimiters,
+a flag specifying whether delimiters are retained.
+
+\membersection{wxStringTokenizer::\destruct{wxStringTokenizer}}\label{wxstringtokenizerdtor}
+
+\func{}{\destruct{wxStringTokenizer}}{\void}
+
+Destructor.
+
+\membersection{wxStringTokenizer::CountTokens}\label{wxstringtokenizercounttokens}
+
+\constfunc{virtual int}{CountTokens}{\void}
+
+Returns the number of tokens in the input string.
+
+\membersection{wxStringTokenizer::HasMoreToken}\label{wxstringtokenizerhasmoretoken}
+
+\constfunc{virtual bool}{HasMoreToken}{\void}
+
+Returns TRUE if the tokenizer has further tokens.
+
+\membersection{wxStringTokenizer::NextToken}\label{wxstringtokenizernexttoken}
+
+\constfunc{virtual wxString}{NextToken}{\void}
+
+Returns the next token.
+
+\membersection{wxStringTokenizer::GetString}\label{wxstringtokenizergetstring}
+
+\constfunc{virtual wxString}{GetString}{\void}
+
+Returns the input string.
+
+
+

diff --git a/src/motif/print.cpp b/src/motif/print.cpp
deleted file mode 100644 (file)
index edcfef0..0000000
--- a/src/motif/print.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        print.cpp
-// Purpose:     Print framework
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "print.h"
-#endif
-
-#include "wx/motif/print.h"
-#include "wx/motif/printdlg.h"
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
-#endif
-
-/*
- * Printer
- */
- 
-wxPrinter::wxPrinter(wxPrintData *data):
-  wxPrinterBase(data)
-{
-}
-
-wxPrinter::~wxPrinter()
-{
-}
-
-bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
-{
-    // TODO. See wxPostScriptPrinter::Print for hints.
-    return FALSE;
-}
-
-bool wxPrinter::PrintDialog(wxWindow *parent)
-{
-    wxPrintDialog dialog(parent, & m_printData);
-    return (dialog.ShowModal() == wxID_OK);
-}
-
-bool wxPrinter::Setup(wxWindow *parent)
-{
-    wxPrintDialog dialog(parent, & m_printData);
-    dialog.GetPrintData().SetSetupDialog(TRUE);
-    return (dialog.ShowModal() == wxID_OK);
-}
-
-/*
- * Print preview
- */
-
-wxPrintPreview::wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
-  wxPrintPreviewBase(printout, printoutForPrinting, data)
-{
-    DetermineScaling();
-}
-
-wxPrintPreview::~wxPrintPreview()
-{
-}
-
-bool wxPrintPreview::Print(bool interactive)
-{
-    if (!m_printPrintout)
-        return FALSE;
-    wxPrinter printer(&m_printData);
-    return printer.Print(m_previewFrame, m_printPrintout, interactive);
-}
-
-void wxPrintPreview::DetermineScaling()
-{
-    // TODO
-}
-

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 16c2e4a98a605bd4e268806105adac8402490e4f..af6471df6fa285ef694eb670bb5bdc6ed41c6135 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -236,7 +236,7 @@ int wxFileDialog::ShowModal(void)
      */
     //=======================================================================
 
-    wxString theFilter = ( Strlen(m_wildCard) == 0 ) ? "*.*" : m_wildCard;
+    wxString theFilter = ( Strlen(m_wildCard) == 0 ) ? wxString("*.*") : m_wildCard;
     wxString filterBuffer;
 
     if ( !strchr( theFilter, '|' ) ) {    // only one filter ==> default text

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index c9f91fb860f8e9da976a259215ea11a800f6e9fe..97cdd6eecba85bbe81ac10291a3f7829678f4d4b 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -119,7 +119,6 @@ COMMONOBJS = \
   $(MSWDIR)\mimetype.obj \
   $(MSWDIR)\module.obj \
   $(MSWDIR)\object.obj \
-  $(MSWDIR)\postscrp.obj \
   $(MSWDIR)\prntbase.obj \
   $(MSWDIR)\resource.obj \
   $(MSWDIR)\tbarbase.obj \
@@ -521,8 +520,6 @@ $(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
 
 $(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
 
-$(MSWDIR)\postscrp.obj:     $(COMMDIR)\postscrp.$(SRCSUFF)
-
 $(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 2e24517e00208efc9876fde658b2fb0f751ad764..b2810c50e99c13785d33b3b5b1179f2d1d0f5810 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -131,9 +131,6 @@ COMMONOBJS = \
 # Fails when including png.h, on jmp_buf.
 #  $(COMMDIR)\image.obj \
 
-# Don't need this
-# $(COMMDIR)\postscrp.obj \
- 
 MSWOBJS = \
   $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \
@@ -785,11 +782,6 @@ $(COMMDIR)/odbc.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/postscrp.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/process.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index a7f1f9ca31682ba4a950cdb4f53e6d83b27f145b..1c20c8c0e11f10202d76bfff26ed9f6a09d6fa10 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -49,8 +49,7 @@ NONESSENTIALOBJS= \
   $(GENDIR)\msgdlgg.obj \
   $(GENDIR)\helpxlp.obj \
   $(GENDIR)\colrdlgg.obj \
-  $(GENDIR)\fontdlgg.obj \
-  $(COMMDIR)\postscrp.obj
+  $(GENDIR)\fontdlgg.obj
 
 COMMONOBJS = \
   $(COMMDIR)\cmndata.obj \

diff --git a/src/msw/makefile.sl b/src/msw/makefile.sl
index 0259a517a5d75bab5d86530ec1af45a8058db1be..1a08e2b644e13b78e14d9f032bce4b6eaa0513e2 100644 (file)
--- a/src/msw/makefile.sl
+++ b/src/msw/makefile.sl
@@ -38,8 +38,7 @@ NONESSENTIALOBJS= printps.obj \
   msgdlgg.obj \
   helpxlp.obj \
   colrdlgg.obj \
-  fontdlgg.obj \
-  postscrp.obj
+  fontdlgg.obj
 
 COMMONOBJS = cmndata.obj \
   config.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index a125464921cacad65efeb75895fa815ec0871a7d..9315e3d1b33dc01f5c4943186deb55ac054b8354 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -47,8 +47,7 @@ NONESSENTIALOBJS= printps.obj &
   msgdlgg.obj &
   helpxlp.obj &
   colrdlgg.obj &
-  fontdlgg.obj &
-  postscrp.obj
+  fontdlgg.obj
 
 COMMONOBJS = cmndata.obj &
   config.obj &