changed the notebook control to use AddPage() interface (Julian's version

[wxWidgets.git] / src / common / postscrp.cpp

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 7d923a520eaf41c700ca9ca531169f4ee1e2395e..d36e6fa01541f2f007fc175f2eadaa2f24b7f77f 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -1711,8 +1711,7 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
         }
        // JC 2.) check for UnderlineThickness
         else if(strncmp(line,"UnderlineThickness",18)==0){
-           if((sscanf(line,"%s%
-f",utString,&UnderlineThickness)!=2)
+           if((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2)
             || (strcmp(utString,"UnderlineThickness")!=0)) {
            wxDebugMsg("AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n",
                       afmName,line);
@@ -2066,7 +2065,7 @@ wxDialog(parent, -1, title, pos, size, style)
 
   wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1),
                2,orientation,2,0);
-  radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation());
+  radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1);
 
   // @@@ Configuration hook
   if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL)
@@ -2145,7 +2144,7 @@ int wxPostScriptPrintDialog::ShowModal (void)
       wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
 #endif
 
-      wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == PS_LANDSCAPE ? PS_LANDSCAPE : PS_PORTRAIT));
+      wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? PS_LANDSCAPE : PS_PORTRAIT));
 
       // C++ wants this
       switch ( radio1->GetSelection() ) {