return;
char buf[100];
- char *name;
- char *style = "";
+ const char *name;
+ const char *style = "";
int Style = m_font.GetStyle ();
int Weight = m_font.GetWeight ();
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:
// 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.
- name = wxTheFontNameDirectory.GetAFMName(Family, Weight, Style);
+ name = wxTheFontNameDirectory->GetAFMName(Family, Weight, Style);
if (!name)
name = "unknown";
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";
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";
(void) new wxButton (this, wxID_CANCEL, _("Cancel"), wxPoint(40, 5));
okBut->SetDefault();
- int yPos = 30;
+ int yPos = 40;
-#ifdef __X__
- (void) new wxStaticText(this, -1, "Printer Command: ", wxPoint(5, yPos));
+#if defined(__WXGTK__) || defined (__WXMOTIF__)
+ (void) new wxStaticText(this, -1, _("Printer Command: "), wxPoint(5, yPos));
wxTextCtrl *text_prt = new wxTextCtrl(this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(), wxPoint(100, yPos), wxSize(100, -1));
-
+
(void) new wxStaticText(this, -1, "Printer Options: ", wxPoint(210, yPos));
- wxTextCtrl *text0 = new wxTextCtrl(this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), wxPoint(305, -1), wxSize(150, -1));
+ wxTextCtrl *text0 = new wxTextCtrl(this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), wxPoint(305, yPos), wxSize(150, -1));
- yPos += 25;
+ yPos += 40;
#endif
wxString orientation[2];
sprintf (buf, "%.2f", wx_printer_scale_x);
- yPos += 60;
+ yPos += 90;
(void) new wxStaticText(this, -1, "X Scaling", wxPoint(5, yPos));
- /* wxTextCtrl *text1 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_SCALE, buf, wxPoint(100, -1), wxSize(100, -1));
+ /* wxTextCtrl *text1 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_SCALE, buf, wxPoint(100, yPos), wxSize(100, -1));
sprintf (buf, "%.2f", wx_printer_scale_y);
- (void) new wxStaticText(this, -1, "Y Scaling", wxPoint(120, yPos));
- /* wxTextCtrl *text2 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_SCALE, buf, wxPoint(230, -1), wxSize(100, -1));
+ (void) new wxStaticText(this, -1, "Y Scaling", wxPoint(220, yPos));
+ /* wxTextCtrl *text2 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_SCALE, buf, wxPoint(320, yPos), wxSize(100, -1));
yPos += 25;
(void) new wxStaticText(this, -1, "X Translation", wxPoint(5, yPos));
sprintf (buf, "%.2ld", wx_printer_translate_x);
- /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, -1), wxSize(100, -1));
+ /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, yPos), wxSize(100, -1));
- (void) new wxStaticText(this, -1, "Y Translation", wxPoint(120, yPos));
+ (void) new wxStaticText(this, -1, "Y Translation", wxPoint(220, yPos));
sprintf (buf, "%.2ld", wx_printer_translate_y);
- /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(230, -1), wxSize(100, -1));
+ /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(320, yPos), wxSize(100, -1));
Fit ();
// C++ wants this
switch ( radio1->GetSelection() ) {
- case PS_PREVIEW: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break;
- case PS_FILE: wxThePrintSetupData->SetPrinterMode(PS_FILE); break;
- case PS_PRINTER: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break;
+ case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break;
+ case 1: wxThePrintSetupData->SetPrinterMode(PS_FILE); break;
+ case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break;
}
return wxID_OK;
}
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)