some "const"s added

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

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index e8b72bdd692181c353c339a609a5ced2e3f0c488..3c8a2e39afee251b78481828482938eb7231f482 100644 (file)
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -284,7 +284,7 @@ class WXDLLEXPORT wxPrintPaperDatabase: public wxList
   void ClearDatabase(void);
 
   void AddPaperType(char *name, int wmm, int hmm, int wp, int hp);
   void ClearDatabase(void);
 
   void AddPaperType(char *name, int wmm, int hmm, int wp, int hp);

-  wxPrintPaperType *FindPaperType(char *name);
+  wxPrintPaperType *FindPaperType(const char *name);

 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index b713fbc614419ab0d8d6c751d6ba9b05742657d2..b1b455853ae6fcc03bbd106e6f8a9d7f0c02dbb7 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -94,7 +94,7 @@ class WXDLLEXPORT wxPrintout: public wxObject
 
    bool isPreview;
  public:
 
    bool isPreview;
  public:

-  wxPrintout(char *title = "Printout");
+  wxPrintout(const char *title = "Printout");

   ~wxPrintout(void);
 
   virtual bool OnBeginDocument(int startPage, int endPage);
   ~wxPrintout(void);
 
   virtual bool OnBeginDocument(int startPage, int endPage);

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 3ab71e83d845437456ace1e92caa0bb4366be076..196350876e63f0326f4dec74e73b84a3fee1b85a 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -690,8 +690,8 @@ void wxPostScriptDC::SetFont (const wxFont& the_font)
        return;
 
   char buf[100];
        return;
 
   char buf[100];

-  char *name;
-  char *style = "";
+  const char *name;
+  const char *style = "";

   int Style = m_font.GetStyle ();
   int Weight = m_font.GetWeight ();
 
   int Style = m_font.GetStyle ();
   int Weight = m_font.GetWeight ();
 


@@ -790,12 +790,12 @@ void wxPostScriptDC::SetPen (const wxPen& pen)
      will be first black line *2* units long, then space 4 units, then the
      pattern of *3* units black, 4 units space will be repeated.
    */
      will be first black line *2* units long, then space 4 units, then the
      pattern of *3* units black, 4 units space will be repeated.
    */

-  static char *dotted = "[2 5] 2";
-  static char *short_dashed = "[4 4] 2";
-  static char *long_dashed = "[4 8] 2";
-  static char *dotted_dashed = "[6 6 2 6] 4";
+  static const char *dotted = "[2 5] 2";
+  static const char *short_dashed = "[4 4] 2";
+  static const char *long_dashed = "[4 8] 2";
+  static const char *dotted_dashed = "[6 6 2 6] 4";

 
 

-  char *psdash = NULL;
+  const char *psdash = NULL;

   switch (m_pen.GetStyle ())
     {
     case wxDOT:
   switch (m_pen.GetStyle ())
     {
     case wxDOT:


@@ -1640,7 +1640,7 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
 
     // 1. construct filename ******************************************
     /* MATTHEW: [2] Use wxTheFontNameDirectory */
 
     // 1. construct filename ******************************************
     /* MATTHEW: [2] Use wxTheFontNameDirectory */

-    char *name;
+    const char *name;

 
        // Julian - we'll need to do this a different way now we've removed the
        // font directory system. Must find Stefan's original code.
 
        // Julian - we'll need to do this a different way now we've removed the
        // font directory system. Must find Stefan's original code.


@@ -1983,7 +1983,7 @@ long wxPostScriptDC::LogicalToDeviceYRel (long y) const
 
 void wxPostScriptDC::GetSize(int* width, int* height) const
 {
 
 void wxPostScriptDC::GetSize(int* width, int* height) const
 {

-  char *paperType = wxThePrintSetupData->GetPaperName();
+  const char *paperType = wxThePrintSetupData->GetPaperName();

   if (!paperType)
     paperType = "A4 210 x 297 mm";
 
   if (!paperType)
     paperType = "A4 210 x 297 mm";
 


@@ -2004,7 +2004,7 @@ void wxPostScriptDC::GetSize(int* width, int* height) const
 
 void wxPostScriptDC::GetSizeMM(long *width, long *height) const
 {
 
 void wxPostScriptDC::GetSizeMM(long *width, long *height) const
 {

-  char *paperType = wxThePrintSetupData->GetPaperName();
+  const char *paperType = wxThePrintSetupData->GetPaperName();

   if (!paperType)
     paperType = "A4 210 x 297 mm";
 
   if (!paperType)
     paperType = "A4 210 x 297 mm";
 


@@ -2565,7 +2565,7 @@ void wxPrintPaperDatabase::AddPaperType(char *name, int wmm, int hmm, int wp, in
   Append(name, new wxPrintPaperType(name, wmm, hmm, wp, hp));
 }
 
   Append(name, new wxPrintPaperType(name, wmm, hmm, wp, hp));
 }
 

-wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(char *name)
+wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const char *name)

 {
   wxNode *node = Find(name);
   if (node)
 {
   wxNode *node = Find(name);
   if (node)

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 99dcfbc57d012d32a02f573bad631b3ba900984f..9f0da1d25f2e9fe458d2bbbdfea57cb61fe3e75c 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -148,9 +148,9 @@ void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout)
  * Printout class
  */
  
  * Printout class
  */
  

-wxPrintout::wxPrintout(char *title)
+wxPrintout::wxPrintout(const char *title)

 {
 {

-  printoutTitle = title ? copystring(title) : (char*)NULL;
+  printoutTitle = title ? copystring(title) : NULL;

   printoutDC = NULL;
   pageWidthMM = 0;
   pageHeightMM = 0;
   printoutDC = NULL;
   pageWidthMM = 0;
   pageHeightMM = 0;