Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

non-pch build fix, indentation and whitespace cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-09-13 16:41:28 +00:00
parent 376b252c63
commit a7060b8cae
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/print.cpp
View File

@@ -26,6 +26,7 @@
#include "wx/math.h" #include "wx/math.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/crt.h"
#endif #endif
#include "wx/fontutil.h" #include "wx/fontutil.h"
@@ -183,12 +184,11 @@ wxPrintNativeDataBase *wxGtkPrintFactory::CreatePrintNativeData()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// We use it to pass useful objets to gtk printing callback functions. // We use it to pass useful objets to gtk printing callback functions.
typedef struct struct wxPrinterToGtkData
{ {
wxGtkPrinter * printer; wxGtkPrinter * printer;
wxPrintout * printout; wxPrintout * printout;
} };
wxPrinterToGtkData;
extern "C" extern "C"
{ {
@@ -552,11 +552,11 @@ void wxGtkPrintNativeData::SetPrintConfig( GtkPrintSettings * config )
GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings) GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings)
{ {
GtkPageSetup* page_setup = gtk_page_setup_new(); GtkPageSetup* page_setup = gtk_page_setup_new();
gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings)); gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings); GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
if (paper_size != NULL) if (paper_size != NULL)
gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size); gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
return page_setup; return page_setup;
} }
@@ -565,7 +565,7 @@ GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* s
void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup) void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup)
{ {
gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup)); gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup));
gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup)); gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@@ -637,7 +637,7 @@ int wxGtkPrintDialog::ShowModal()
// If the settings are OK, we restore it. // If the settings are OK, we restore it.
if (settings != NULL) if (settings != NULL)
gtk_print_operation_set_print_settings (native->GetPrintJob(), settings); gtk_print_operation_set_print_settings (native->GetPrintJob(), settings);
gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings)); gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings));
// Show the dialog if needed. // Show the dialog if needed.
GError* gError = NULL; GError* gError = NULL;
@@ -678,8 +678,8 @@ int wxGtkPrintDialog::ShowModal()
range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges); range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges);
if (num_ranges >= 1) if (num_ranges >= 1)
{ {
m_printDialogData.SetFromPage( range[0].start ); m_printDialogData.SetFromPage( range[0].start );
m_printDialogData.SetToPage( range[0].end ); m_printDialogData.SetToPage( range[0].end );
} }
else { else {
m_printDialogData.SetAllPages( true ); m_printDialogData.SetAllPages( true );
@@ -981,8 +981,8 @@ void wxGtkPrinter::DrawPage(wxPrintout *printout, GtkPrintOperation *operation,
// We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint. // We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint.
if (num_ranges >= 1) if (num_ranges >= 1)
{ {
startPage = range[0].start + 1; startPage = range[0].start + 1;
endPage = range[0].end + 1; endPage = range[0].end + 1;
} }
else { else {
startPage = minPage; startPage = minPage;