#include "wx/math.h"
#include "wx/image.h"
#include "wx/module.h"
+ #include "wx/crt.h"
#endif
#include "wx/fontutil.h"
#include "wx/gtk/private.h"
#include "wx/dynlib.h"
#include "wx/paper.h"
+#include "wx/dcprint.h"
+#include "wx/testing.h"
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-pango.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <libgnomeprintui/gnome-print-paper-selector.h>
-static const double RAD2DEG = 180.0 / M_PI;
-
#include "wx/link.h"
wxFORCE_LINK_THIS_MODULE(gnome_print)
// wxGnomePrintLibrary
//----------------------------------------------------------------------------
-#define wxDL_METHOD_DEFINE( rettype, name, args, shortargs, defret ) \
- typedef rettype (* name ## Type) args ; \
- name ## Type pfn_ ## name; \
- rettype name args \
- { if (m_ok) return pfn_ ## name shortargs ; return defret; }
-
-#define wxDL_METHOD_LOAD( lib, name, success ) \
- pfn_ ## name = (name ## Type) lib->GetSymbol( wxT(#name), &success ); \
- if (!success) return;
-
class wxGnomePrintLibrary
{
public:
~wxGnomePrintLibrary();
bool IsOk();
- void InitializeMethods();
-
private:
- bool m_ok;
- wxDynamicLibrary *m_gnome_print_lib;
- wxDynamicLibrary *m_gnome_printui_lib;
+ bool InitializeMethods();
+
+ wxDynamicLibrary m_libGnomePrint;
+ wxDynamicLibrary m_libGnomePrintUI;
+
+ // only true if we successfully loaded both libraries
+ //
+ // don't rename this field, it's used by wxDL_XXX macros internally
+ bool m_ok;
public:
wxDL_METHOD_DEFINE( gint, gnome_print_newpath,
wxDL_METHOD_DEFINE( gint, gnome_print_grestore,
(GnomePrintContext *pc), (pc), 0 )
+ wxDL_METHOD_DEFINE( gint, gnome_print_clip,
+ (GnomePrintContext *pc), (pc), 0 )
+ wxDL_METHOD_DEFINE( gint, gnome_print_eoclip,
+ (GnomePrintContext *pc), (pc), 0 )
+
wxDL_METHOD_DEFINE( gint, gnome_print_beginpage,
(GnomePrintContext *pc, const guchar* name), (pc, name), 0 )
wxDL_METHOD_DEFINE( gint, gnome_print_showpage,
wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout,
(GnomePrintContext *gpc), (gpc), NULL )
- wxDL_METHOD_DEFINE( void, gnome_print_pango_layout,
- (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout), /**/ )
+ wxDL_VOIDMETHOD_DEFINE( gnome_print_pango_layout,
+ (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout) )
wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new,
(GnomePrintConfig *config), (config), NULL )
(void), (), NULL )
wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set,
(GnomePrintConfig *config, const guchar *key, const guchar *value), (config, key, value), false )
+ wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_double,
+ (GnomePrintConfig *config, const guchar *key, gdouble value), (config, key, value), false )
+ wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_int,
+ (GnomePrintConfig *config, const guchar *key, gint value), (config, key, value), false )
+ wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_boolean,
+ (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false )
+ wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length,
+ (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false )
+
+ wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get,
+ (GnomePrintConfig *config, const guchar *key), (config, key), NULL )
wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length,
(GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false )
+ wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_boolean,
+ (GnomePrintConfig *config, const guchar *key, gboolean *val), (config, key, val), false )
wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new,
(GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL )
- wxDL_METHOD_DEFINE( void, gnome_print_dialog_construct_range_page,
+ wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_construct_range_page,
(GnomePrintDialog *gpd, gint flags, gint start, gint end,
const guchar *currentlabel, const guchar *rangelabel),
- (gpd, flags, start, end, currentlabel, rangelabel), /**/ )
- wxDL_METHOD_DEFINE( void, gnome_print_dialog_get_copies,
- (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate), /**/ )
- wxDL_METHOD_DEFINE( void, gnome_print_dialog_set_copies,
- (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate), /**/ )
+ (gpd, flags, start, end, currentlabel, rangelabel) )
+ wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_get_copies,
+ (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate) )
+ wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_set_copies,
+ (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate) )
wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range,
(GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE )
wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page,
wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
(GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
- DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+ wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);
};
wxGnomePrintLibrary::wxGnomePrintLibrary()
{
- m_gnome_print_lib = NULL;
- m_gnome_printui_lib = NULL;
-
wxLogNull log;
- m_gnome_print_lib = new wxDynamicLibrary( wxT("libgnomeprint-2-2.so.0") );
- m_ok = m_gnome_print_lib->IsLoaded();
- if (!m_ok) return;
+ m_libGnomePrint.Load("libgnomeprint-2-2.so.0");
+ m_ok = m_libGnomePrint.IsLoaded();
+ if ( !m_ok )
+ return;
- m_gnome_printui_lib = new wxDynamicLibrary( wxT("libgnomeprintui-2-2.so.0") );
- m_ok = m_gnome_printui_lib->IsLoaded();
- if (!m_ok) return;
+ m_libGnomePrintUI.Load("libgnomeprintui-2-2.so.0");
+ m_ok = m_libGnomePrintUI.IsLoaded();
+ if ( !m_ok )
+ {
+ m_libGnomePrint.Unload();
+ return;
+ }
- InitializeMethods();
+ m_ok = InitializeMethods();
}
wxGnomePrintLibrary::~wxGnomePrintLibrary()
{
- if (m_gnome_print_lib)
- delete m_gnome_print_lib;
- if (m_gnome_printui_lib)
- delete m_gnome_printui_lib;
}
bool wxGnomePrintLibrary::IsOk()
return m_ok;
}
-void wxGnomePrintLibrary::InitializeMethods()
+bool wxGnomePrintLibrary::InitializeMethods()
{
- m_ok = false;
- bool success;
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_newpath, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_moveto, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_lineto, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_curveto, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_arcto, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_closepath, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_stroke, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_fill, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setrgbcolor, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setlinewidth, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setdash, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbimage );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbimage, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbaimage, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_concat );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_concat, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_scale, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rotate, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_translate, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_gsave );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_gsave, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_grestore, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_clip );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_beginpage, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_showpage, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_end_doc, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_beginpage );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_create_layout, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_layout, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_create_layout );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_new, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_context, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_close, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_print, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_page_size, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_new );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_unit_get_by_abbreviation, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_convert_distance, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_unit_get_by_abbreviation );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance );
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_default, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set, success )
- wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_get_length, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_default );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length );
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_new, success )
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_construct_range_page, success )
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_copies, success )
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_set_copies, success )
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range, success )
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range_page, success )
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length );
+ wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean );
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_paper_selector_new_with_flags, success )
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_new );
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page );
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies );
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies );
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range );
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page );
- wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_job_preview_new, success )
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags );
- m_ok = true;
+ wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new );
+
+ return true;
}
-static wxGnomePrintLibrary* gs_lgp = NULL;
+static wxGnomePrintLibrary* gs_libGnomePrint = NULL;
//----------------------------------------------------------------------------
// wxGnomePrintNativeData
wxGnomePrintNativeData::wxGnomePrintNativeData()
{
- m_config = gs_lgp->gnome_print_config_default();
- m_job = gs_lgp->gnome_print_job_new( m_config );
+ m_config = gs_libGnomePrint->gnome_print_config_default();
+ m_job = gs_libGnomePrint->gnome_print_job_new( m_config );
}
wxGnomePrintNativeData::~wxGnomePrintNativeData()
bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
{
- // TODO
+ guchar *res = gs_libGnomePrint->gnome_print_config_get( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
+ if (g_ascii_strcasecmp((const gchar *)res,"R90") == 0)
+ data.SetOrientation( wxLANDSCAPE );
+ else
+ data.SetOrientation( wxPORTRAIT );
+ g_free( res );
+
+ res = gs_libGnomePrint->gnome_print_config_get( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_OUTPUT_FILENAME );
+ if (res)
+ {
+ data.SetFilename( wxConvFile.cMB2WX( (const char*) res ) );
+ wxPrintf( "filename %s\n", data.GetFilename() );
+ g_free( res );
+ }
+ else
+ {
+ data.SetFilename( wxEmptyString );
+ }
+
+ gboolean ret;
+ if (gs_libGnomePrint->gnome_print_config_get_boolean( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_COLLATE, &ret))
+ {
+ data.SetCollate( ret );
+ }
+
+ // gnome_print_v
+
return true;
}
bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
{
- // TODO
+ if (data.GetOrientation() == wxLANDSCAPE)
+ {
+ gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
+ (guchar*)(char*)"R90" );
+ }
+ else
+ {
+ gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
+ (guchar*)(char*)"R0" );
+ }
+
+ if (data.GetCollate())
+ {
+ gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
+ TRUE );
+ }
+ else
+ {
+ gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
+ FALSE );
+ }
+
+ switch (data.GetPaperId())
+ {
+ case wxPAPER_A3: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"A3" );
+ break;
+ case wxPAPER_A5: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"A5" );
+ break;
+ case wxPAPER_B4: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"B4" );
+ break;
+ case wxPAPER_B5: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"B5" );
+ break;
+ case wxPAPER_LETTER: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"USLetter" );
+ break;
+ case wxPAPER_LEGAL: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"USLegal" );
+ break;
+ case wxPAPER_EXECUTIVE: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"Executive" );
+ break;
+ case wxPAPER_ENV_C5: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"C5" );
+ break;
+ case wxPAPER_ENV_C6: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"C6" );
+ break;
+ case wxPAPER_NONE: break;
+
+ default:
+ case wxPAPER_A4: gs_libGnomePrint->gnome_print_config_set( m_config,
+ (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+ (guchar*)(char*)"A4" );
+ break;
+ }
+
return true;
}
return false;
}
-wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxDialog *
+wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
+ wxPrintData * WXUNUSED(data))
{
return NULL;
}
+
+#if wxUSE_NEW_DC
+
+wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
+{
+ return new wxGnomePrinterDCImpl( owner, data );
+}
+
+#else
+
wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
{
- return new wxGnomePrintDC(data);
+ return new wxGnomePrinterDC(data);
}
+#endif
+
bool wxGnomePrintFactory::HasOwnPrintToFile()
{
return true;
{
wxPrintData data = m_printDialogData.GetPrintData();
+ data.ConvertToNative();
+
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) data.GetNativeData();
- m_widget = gs_lgp->gnome_print_dialog_new( native->GetPrintJob(),
+ m_widget = gs_libGnomePrint->gnome_print_dialog_new( native->GetPrintJob(),
(guchar*)"Print",
GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
if (m_printDialogData.GetEnablePageNumbers())
flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
- gs_lgp->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
+ gs_libGnomePrint->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
flag,
m_printDialogData.GetMinPage(),
m_printDialogData.GetMaxPage(),
int wxGnomePrintDialog::ShowModal()
{
- // Transfer data from m_printDalogData to dialog here
+ WX_TESTING_SHOW_MODAL_HOOK();
int response = gtk_dialog_run (GTK_DIALOG (m_widget));
return wxID_CANCEL;
}
+ m_printDialogData.GetPrintData().ConvertFromNative();
+
gint copies = 1;
gboolean collate = false;
- gs_lgp->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );
+ gs_libGnomePrint->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );
m_printDialogData.SetNoCopies( copies );
m_printDialogData.SetCollate( collate );
- switch (gs_lgp->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
+ // Cast needed to avoid warnings because the gnome_print_dialog_get_range()
+ // is declared as returning a wrong enum type.
+ switch ( static_cast<int>( gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget )))
{
case GNOME_PRINT_RANGE_SELECTION:
m_printDialogData.SetSelection( true );
case GNOME_PRINT_RANGE_RANGE:
default:
gint start,end;
- gs_lgp->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );
+ gs_libGnomePrint->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );
m_printDialogData.SetFromPage( start );
m_printDialogData.SetToPage( end );
break;
IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
-wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
- wxPageSetupDialogData* data )
+wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent),
+ wxPageSetupDialogData *data)
{
if (data)
m_pageDialogData = *data;
+ m_pageDialogData.GetPrintData().ConvertToNative();
+
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
- // This is required as the page setup dialog
+ // This *was* required as the page setup dialog
// calculates wrong values otherwise.
- gs_lgp->gnome_print_config_set( native->GetPrintConfig(),
+#if 0
+ gs_libGnomePrint->gnome_print_config_set( native->GetPrintConfig(),
(const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT,
(const guchar*) "Pts" );
+#endif
+
+ GnomePrintConfig *config = native->GetPrintConfig();
+
+ const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+
+ double ml = (double) m_pageDialogData.GetMarginTopLeft().x;
+ double mt = (double) m_pageDialogData.GetMarginTopLeft().y;
+ double mr = (double) m_pageDialogData.GetMarginBottomRight().x;
+ double mb = (double) m_pageDialogData.GetMarginBottomRight().y;
+
+ gs_libGnomePrint->gnome_print_config_set_length (config,
+ (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
+ gs_libGnomePrint->gnome_print_config_set_length (config,
+ (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
+ gs_libGnomePrint->gnome_print_config_set_length (config,
+ (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
+ gs_libGnomePrint->gnome_print_config_set_length (config,
+ (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, mb, mm_unit );
m_widget = gtk_dialog_new();
gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
- GtkWidget *main = gs_lgp->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
+ GtkWidget *main = gs_libGnomePrint->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
gtk_container_set_border_width (GTK_CONTAINER (main), 8);
gtk_widget_show (main);
int wxGnomePageSetupDialog::ShowModal()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
+
GnomePrintConfig *config = native->GetPrintConfig();
- // Transfer data from m_pageDialogData to native dialog
int ret = gtk_dialog_run( GTK_DIALOG(m_widget) );
if (ret == GTK_RESPONSE_OK)
{
// Transfer data back to m_pageDialogData
+ m_pageDialogData.GetPrintData().ConvertFromNative();
// I don't know how querying the last parameter works
- // I cannot test it as the dialog is currently broken
- // anyways (it only works for points).
double ml,mr,mt,mb,pw,ph;
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
- gs_lgp->gnome_print_config_get_length (config,
+ gs_libGnomePrint->gnome_print_config_get_length (config,
(const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL);
- // This probably assumes that the user entered the
- // values in Pts. Since that is the only the dialog
- // works right now, we need to fix this later.
- const GnomePrintUnit *mm_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
- const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
- gs_lgp->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
+ // This code converts correctly from what the user chose
+ // as the unit although I query Pts here
+ const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+ const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+ gs_libGnomePrint->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) );
-#if 0
- wxPrintf( wxT("paper %d %d, top margin %d\n"),
- m_pageDialogData.GetPaperSize().x,
- m_pageDialogData.GetPaperSize().y,
- m_pageDialogData.GetMarginTopLeft().x );
-#endif
-
ret = wxID_OK;
}
else
wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
wxPrinterBase( data )
{
- m_gpc = NULL;
m_native_preview = false;
}
}
wxPrintData printdata = GetPrintDialogData().GetPrintData();
+
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) printdata.GetNativeData();
- GnomePrintJob *job = gs_lgp->gnome_print_job_new( native->GetPrintConfig() );
- m_gpc = gs_lgp->gnome_print_job_get_context (job);
+ GnomePrintJob *job = gs_libGnomePrint->gnome_print_job_new( native->GetPrintConfig() );
// The GnomePrintJob is temporarily stored in the
// native print data as the native print dialog
native->SetPrintJob( job );
- printout->SetIsPreview(false);
-
if (m_printDialogData.GetMinPage() < 1)
m_printDialogData.SetMinPage(1);
if (m_printDialogData.GetMaxPage() < 1)
if (prompt)
dc = PrintDialog( parent );
else
- dc = new wxGnomePrintDC( this );
-
- if (m_native_preview)
- printout->SetIsPreview(true);
+#if wxUSE_NEW_DC
+ dc = new wxPrinterDC( printdata ); // TODO: check that this works
+#else
+ dc = new wxGnomePrinterDC( printdata ); // TODO: check that this works
+#endif
if (!dc)
{
- gs_lgp->gnome_print_job_close( job );
+ gs_libGnomePrint->gnome_print_job_close( job );
g_object_unref (job);
- sm_lastError = wxPRINTER_ERROR;
+ if (sm_lastError != wxPRINTER_CANCELLED)
+ sm_lastError = wxPRINTER_ERROR;
return false;
}
- wxSize ScreenPixels = wxGetDisplaySize();
- wxSize ScreenMM = wxGetDisplaySizeMM();
-
- printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
- (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(),
- wxGnomePrintDC::GetResolution() );
+ printout->SetPPIScreen(wxGetDisplayPPI());
+ printout->SetPPIPrinter( dc->GetResolution(),
+ dc->GetResolution() );
printout->SetDC(dc);
if (maxPage == 0)
{
- gs_lgp->gnome_print_job_close( job );
+ gs_libGnomePrint->gnome_print_job_close( job );
g_object_unref (job);
sm_lastError = wxPRINTER_ERROR;
return false;
printout->OnEndPrinting();
}
- gs_lgp->gnome_print_job_close( job );
+ gs_libGnomePrint->gnome_print_job_close( job );
if (m_native_preview)
{
const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
- GtkWidget *preview = gs_lgp->gnome_print_job_preview_new
+ GtkWidget *preview = gs_libGnomePrint->gnome_print_job_preview_new
(
job,
(const guchar *)title.data()
}
else
{
- gs_lgp->gnome_print_job_print( job );
+ gs_libGnomePrint->gnome_print_job_print( job );
}
g_object_unref (job);
m_native_preview = ret == wxID_PREVIEW;
m_printDialogData = dialog.GetPrintDialogData();
- return new wxGnomePrintDC( this );
+#if wxUSE_NEW_DC
+ return new wxPrinterDC( m_printDialogData.GetPrintData() );
+#else
+ return new wxGnomePrinterDC( m_printDialogData.GetPrintData() );
+#endif
}
-bool wxGnomePrinter::Setup( wxWindow *parent )
+bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent))
{
return false;
}
//-----------------------------------------------------------------------------
-// wxGnomePrintDC
+// wxGnomePrinterDC
//-----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxGnomePrintDC, wxDC)
+// conversion
+static const double RAD2DEG = 180.0 / M_PI;
-wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer )
-{
- m_printer = printer;
+// we don't want to use only 72 dpi from GNOME print
+static const int DPI = 600;
+static const double PS2DEV = 600.0 / 72.0;
+static const double DEV2PS = 72.0 / 600.0;
- m_gpc = printer->GetPrintContext();
- m_job = NULL; // only used and destroyed when created with wxPrintData
+#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * DEV2PS)
+#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
+#define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
+#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
- m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc );
- m_fontdesc = pango_font_description_from_string( "Sans 12" );
- m_context = NULL;
-
- m_currentRed = 0;
- m_currentBlue = 0;
- m_currentGreen = 0;
-
- m_signX = 1; // default x-axis left to right
- m_signY = -1; // default y-axis bottom up -> top down
-
- GetSize( NULL, &m_deviceOffsetY );
-}
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC)
+#endif
-wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data )
+#if wxUSE_NEW_DC
+wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+ wxDCImpl( owner )
+#else
+wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
+#endif
{
- m_printer = NULL;
m_printData = data;
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_printData.GetNativeData();
- GnomePrintJob *job = gs_lgp->gnome_print_job_new( native->GetPrintConfig() );
- m_gpc = gs_lgp->gnome_print_job_get_context (job);
- m_job = job; // only used and destroyed when created with wxPrintData
+ m_job = native->GetPrintJob();
+ m_gpc = gs_libGnomePrint->gnome_print_job_get_context (m_job);
- m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc );
+ m_layout = gs_libGnomePrint->gnome_print_pango_create_layout( m_gpc );
m_fontdesc = pango_font_description_from_string( "Sans 12" );
m_context = NULL;
m_currentBlue = 0;
m_currentGreen = 0;
- m_signX = 1; // default x-axis left to right
- m_signY = -1; // default y-axis bottom up -> top down
-
- GetSize( NULL, &m_deviceOffsetY );
+ // Query page size. This seems to omit the margins
+ double pw,ph;
+ gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+
+ m_pageHeight = ph * PS2DEV;
}
-wxGnomePrintDC::~wxGnomePrintDC()
+wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl()
{
- if (m_job)
- g_object_unref (m_job);
}
-bool wxGnomePrintDC::IsOk() const
+bool wxGnomePrinterDCImpl::IsOk() const
{
return true;
}
-bool wxGnomePrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style )
+bool
+wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
+ wxCoord WXUNUSED(y1),
+ const wxColour& WXUNUSED(col),
+ wxFloodFillStyle WXUNUSED(style))
{
return false;
}
-bool wxGnomePrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const
+bool
+wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),
+ wxCoord WXUNUSED(y1),
+ wxColour * WXUNUSED(col)) const
{
return false;
}
-void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if ( m_pen.IsTransparent() )
+ return;
SetPen( m_pen );
- gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
- gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
- gs_lgp->gnome_print_stroke ( m_gpc);
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
+ gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
+ gs_libGnomePrint->gnome_print_stroke ( m_gpc);
CalcBoundingBox( x1, y1 );
CalcBoundingBox( x2, y2 );
}
-void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
{
}
-void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
{
double dx = x1 - xc;
double dy = y1 - yc;
alpha1 = 0.0;
alpha2 = 360.0;
}
- else
- if (radius == 0.0)
+ else if ( wxIsNullDouble(radius) )
{
- alpha1 = alpha2 = 0.0;
+ alpha1 =
+ alpha2 = 0.0;
}
else
{
while (alpha2 > 360) alpha2 -= 360;
}
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
- gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
- gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+ gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
- gs_lgp->gnome_print_fill( m_gpc );
+ gs_libGnomePrint->gnome_print_fill( m_gpc );
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
- gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
- gs_lgp->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+ gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
}
CalcBoundingBox (x1, y1);
CalcBoundingBox (xc, yc);
}
-void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
x += w/2;
y += h/2;
- int xx = XLOG2DEV(x);
- int yy = YLOG2DEV(y);
+ double xx = XLOG2DEV(x);
+ double yy = YLOG2DEV(y);
- gs_lgp->gnome_print_gsave( m_gpc );
+ gs_libGnomePrint->gnome_print_gsave( m_gpc );
- gs_lgp->gnome_print_translate( m_gpc, xx, yy );
+ gs_libGnomePrint->gnome_print_translate( m_gpc, xx, yy );
double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
- gs_lgp->gnome_print_scale( m_gpc, 1.0, scale );
+ gs_libGnomePrint->gnome_print_scale( m_gpc, 1.0, scale );
- xx = 0;
- yy = 0;
+ xx = 0.0;
+ yy = 0.0;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
- gs_lgp->gnome_print_moveto ( m_gpc, xx, yy );
- gs_lgp->gnome_print_arcto( m_gpc, xx, yy,
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
+ gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
XLOG2DEVREL(w)/2, sa, ea, 0 );
- gs_lgp->gnome_print_moveto ( m_gpc, xx, yy );
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
- gs_lgp->gnome_print_fill( m_gpc );
+ gs_libGnomePrint->gnome_print_fill( m_gpc );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
- gs_lgp->gnome_print_arcto( m_gpc, xx, yy,
+ gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
XLOG2DEVREL(w)/2, sa, ea, 0 );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
}
- gs_lgp->gnome_print_grestore( m_gpc );
+ gs_libGnomePrint->gnome_print_grestore( m_gpc );
CalcBoundingBox( x, y );
CalcBoundingBox( x+w, y+h );
}
-void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
{
}
-void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
{
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
-
if (n <= 0) return;
+ if ( m_pen.IsTransparent() )
+ return;
+
SetPen (m_pen);
int i;
for ( i =0; i<n ; i++ )
CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
- gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+ gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
for (i = 1; i < n; i++)
- gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+ gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
- gs_lgp->gnome_print_stroke ( m_gpc);
+ gs_libGnomePrint->gnome_print_stroke ( m_gpc);
}
-void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+ wxCoord xoffset, wxCoord yoffset,
+ wxPolygonFillMode WXUNUSED(fillStyle))
{
if (n==0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
int x = points[0].x + xoffset;
int y = points[0].y + yoffset;
CalcBoundingBox( x, y );
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
int i;
for (i = 1; i < n; i++)
{
- int x = points[i].x + xoffset;
- int y = points[i].y + yoffset;
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ x = points[i].x + xoffset;
+ y = points[i].y + yoffset;
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
CalcBoundingBox( x, y );
}
- gs_lgp->gnome_print_closepath( m_gpc );
- gs_lgp->gnome_print_fill( m_gpc );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_fill( m_gpc );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
int x = points[0].x + xoffset;
int y = points[0].y + yoffset;
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
int i;
for (i = 1; i < n; i++)
{
- int x = points[i].x + xoffset;
- int y = points[i].y + yoffset;
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ x = points[i].x + xoffset;
+ y = points[i].y + yoffset;
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
CalcBoundingBox( x, y );
}
- gs_lgp->gnome_print_closepath( m_gpc );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
}
}
-void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
{
+#if wxUSE_NEW_DC
+ wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#else
wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#endif
}
-void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ width--;
+ height--;
+
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
- gs_lgp->gnome_print_closepath( m_gpc );
- gs_lgp->gnome_print_fill( m_gpc );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_fill( m_gpc );
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
- gs_lgp->gnome_print_closepath( m_gpc );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
}
-void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
- wxCoord rad = (wxCoord) radius;
+ width--;
+ height--;
+
+ wxCoord rad = wxRound( radius );
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush(m_brush);
- gs_lgp->gnome_print_newpath(m_gpc);
- gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_newpath(m_gpc);
+ gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + rad),YLOG2DEV(y),
XLOG2DEV(x),YLOG2DEV(y),
XLOG2DEV(x),YLOG2DEV(y + rad));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x),YLOG2DEV(y + height - rad),
XLOG2DEV(x),YLOG2DEV(y + height),
XLOG2DEV(x + rad),YLOG2DEV(y + height));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
XLOG2DEV(x + width),YLOG2DEV(y + height),
XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + width),YLOG2DEV(y + rad),
XLOG2DEV(x + width),YLOG2DEV(y),
XLOG2DEV(x + width - rad),YLOG2DEV(y));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
- gs_lgp->gnome_print_closepath(m_gpc);
- gs_lgp->gnome_print_fill(m_gpc);
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+ gs_libGnomePrint->gnome_print_closepath(m_gpc);
+ gs_libGnomePrint->gnome_print_fill(m_gpc);
CalcBoundingBox(x,y);
CalcBoundingBox(x+width,y+height);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen(m_pen);
- gs_lgp->gnome_print_newpath(m_gpc);
- gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_newpath(m_gpc);
+ gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + rad),YLOG2DEV(y),
XLOG2DEV(x),YLOG2DEV(y),
XLOG2DEV(x),YLOG2DEV(y + rad));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x),YLOG2DEV(y + height - rad),
XLOG2DEV(x),YLOG2DEV(y + height),
XLOG2DEV(x + rad),YLOG2DEV(y + height));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
XLOG2DEV(x + width),YLOG2DEV(y + height),
XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV(x + width),YLOG2DEV(y + rad),
XLOG2DEV(x + width),YLOG2DEV(y),
XLOG2DEV(x + width - rad),YLOG2DEV(y));
- gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
- gs_lgp->gnome_print_closepath(m_gpc);
- gs_lgp->gnome_print_stroke(m_gpc);
+ gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+ gs_libGnomePrint->gnome_print_closepath(m_gpc);
+ gs_libGnomePrint->gnome_print_stroke(m_gpc);
CalcBoundingBox(x,y);
CalcBoundingBox(x+width,y+height);
}
}
-void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
+void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y,
wxCoord width, wxCoord height)
{
- double r = 4 * (sqrt (2) - 1) / 3;
+ double r = 4 * (sqrt(2.) - 1) / 3;
double halfW = 0.5 * width,
halfH = 0.5 * height,
halfWR = r * halfW,
wxCoord halfWI = (wxCoord) halfW,
halfHI = (wxCoord) halfH;
- gs_lgp->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
// Approximate an ellipse using four cubic splines, clockwise from 0 deg */
- gs_lgp->gnome_print_moveto( m_gpc,
+ gs_libGnomePrint->gnome_print_moveto( m_gpc,
XLOG2DEV(x + width),
YLOG2DEV(y + halfHI) );
- gs_lgp->gnome_print_curveto( m_gpc,
+ gs_libGnomePrint->gnome_print_curveto( m_gpc,
XLOG2DEV(x + width),
YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
YLOG2DEV(y + height),
XLOG2DEV(x + halfWI),
YLOG2DEV(y + height) );
- gs_lgp->gnome_print_curveto( m_gpc,
+ gs_libGnomePrint->gnome_print_curveto( m_gpc,
XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
YLOG2DEV(y + height),
XLOG2DEV(x),
YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
XLOG2DEV(x), YLOG2DEV(y+halfHI) );
- gs_lgp->gnome_print_curveto( m_gpc,
+ gs_libGnomePrint->gnome_print_curveto( m_gpc,
XLOG2DEV(x),
YLOG2DEV(y + (wxCoord) rint (halfH - halfHR)),
XLOG2DEV(x + (wxCoord) rint (halfW - halfWR)),
YLOG2DEV(y),
XLOG2DEV(x+halfWI), YLOG2DEV(y) );
- gs_lgp->gnome_print_curveto( m_gpc,
+ gs_libGnomePrint->gnome_print_curveto( m_gpc,
XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
YLOG2DEV(y),
XLOG2DEV(x + width),
YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
- gs_lgp->gnome_print_closepath(m_gpc);
+ gs_libGnomePrint->gnome_print_closepath(m_gpc);
}
-void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ width--;
+ height--;
+
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
makeEllipticalPath( x, y, width, height );
- gs_lgp->gnome_print_fill( m_gpc );
+ gs_libGnomePrint->gnome_print_fill( m_gpc );
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
makeEllipticalPath( x, y, width, height );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
}
#if wxUSE_SPLINES
-void wxGnomePrintDC::DoDrawSpline(wxList *points)
+void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points)
{
SetPen (m_pen);
double c, d, x1, y1, x2, y2, x3, y3;
wxPoint *p, *q;
- wxList::compatibility_iterator node = points->GetFirst();
- p = (wxPoint *)node->GetData();
+ wxPointList::compatibility_iterator node = points->GetFirst();
+ p = node->GetData();
x1 = p->x;
y1 = p->y;
node = node->GetNext();
- p = (wxPoint *)node->GetData();
+ p = node->GetData();
c = p->x;
d = p->y;
x3 =
y3 =
(double)(y1 + d) / 2;
- gs_lgp->gnome_print_newpath( m_gpc );
- gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
- gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
node = node->GetNext();
while (node)
{
- q = (wxPoint *)node->GetData();
+ q = node->GetData();
x1 = x3;
y1 = y3;
x3 = (double)(x2 + c) / 2;
y3 = (double)(y2 + d) / 2;
- gs_lgp->gnome_print_curveto(m_gpc,
+ gs_libGnomePrint->gnome_print_curveto(m_gpc,
XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
node = node->GetNext();
}
- gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
+ gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
- gs_lgp->gnome_print_stroke( m_gpc );
+ gs_libGnomePrint->gnome_print_stroke( m_gpc );
}
#endif // wxUSE_SPLINES
-bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
- wxCoord xsrcMask, wxCoord ysrcMask)
+bool
+wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+ wxCoord width, wxCoord height,
+ wxDC *source,
+ wxCoord xsrc, wxCoord ysrc,
+ wxRasterOperationMode rop,
+ bool WXUNUSED(useMask),
+ wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
{
wxCHECK_MSG( source, false, wxT("invalid source dc") );
memDC.SelectObject(wxNullBitmap);
// draw bitmap. scaling and positioning is done there
- DrawBitmap( bitmap, xdest, ydest );
+ GetOwner()->DrawBitmap( bitmap, xdest, ydest );
return true;
}
-void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
{
DoDrawBitmap( icon, x, y, true );
}
-void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
+void
+wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
+ wxCoord x, wxCoord y,
+ bool WXUNUSED(useMask))
{
- if (!bitmap.Ok()) return;
+ if (!bitmap.IsOk()) return;
if (bitmap.HasPixbuf())
{
int height = gdk_pixbuf_get_height( pixbuf );
int width = gdk_pixbuf_get_width( pixbuf );
- gs_lgp->gnome_print_gsave( m_gpc );
+ gs_libGnomePrint->gnome_print_gsave( m_gpc );
double matrix[6];
matrix[0] = XLOG2DEVREL(width);
matrix[1] = 0;
matrix[3] = YLOG2DEVREL(height);
matrix[4] = XLOG2DEV(x);
matrix[5] = YLOG2DEV(y+height);
- gs_lgp->gnome_print_concat( m_gpc, matrix );
- gs_lgp->gnome_print_moveto( m_gpc, 0, 0 );
+ gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, 0, 0 );
if (has_alpha)
- gs_lgp->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+ gs_libGnomePrint->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
else
- gs_lgp->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
- gs_lgp->gnome_print_grestore( m_gpc );
+ gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+ gs_libGnomePrint->gnome_print_grestore( m_gpc );
}
else
{
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return;
+ if (!image.IsOk()) return;
- gs_lgp->gnome_print_gsave( m_gpc );
+ gs_libGnomePrint->gnome_print_gsave( m_gpc );
double matrix[6];
matrix[0] = XLOG2DEVREL(image.GetWidth());
matrix[1] = 0;
matrix[3] = YLOG2DEVREL(image.GetHeight());
matrix[4] = XLOG2DEV(x);
matrix[5] = YLOG2DEV(y+image.GetHeight());
- gs_lgp->gnome_print_concat( m_gpc, matrix );
- gs_lgp->gnome_print_moveto( m_gpc, 0, 0 );
- gs_lgp->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
- gs_lgp->gnome_print_grestore( m_gpc );
+ gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, 0, 0 );
+ gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+ gs_libGnomePrint->gnome_print_grestore( m_gpc );
}
}
-void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
{
DoDrawRotatedText( text, x, y, 0.0 );
}
-void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
{
- x = XLOG2DEV(x);
- y = YLOG2DEV(y);
+ double xx = XLOG2DEV(x);
+ double yy = YLOG2DEV(y);
- bool underlined = m_font.Ok() && m_font.GetUnderlined();
+ const wxScopedCharBuffer data(text.utf8_str());
-#if wxUSE_UNICODE
- const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
- const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
- if ( !wdata )
- return;
- const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-#endif
-
- size_t datalen = strlen((const char*)data);
- pango_layout_set_text( m_layout, (const char*) data, datalen);
-
- if (underlined)
- {
- PangoAttrList *attrs = pango_attr_list_new();
- PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
- a->start_index = 0;
- a->end_index = datalen;
- pango_attr_list_insert(attrs, a);
- pango_layout_set_attributes(m_layout, attrs);
- pango_attr_list_unref(attrs);
- }
+ pango_layout_set_text(m_layout, data, data.length());
+ const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
- if (m_textForegroundColour.Ok())
+ if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
- gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+ gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
m_currentRed = red;
m_currentBlue = blue;
}
}
- int w,h;
-
- if (fabs(m_scaleY - 1.0) > 0.00001)
- {
- // If there is a user or actually any scale applied to
- // the device context, scale the font.
-
- // scale font description
- gint oldSize = pango_font_description_get_size( m_fontdesc );
- double size = oldSize;
- size = size * m_scaleY;
- pango_font_description_set_size( m_fontdesc, (gint)size );
-
- // actually apply scaled font
- pango_layout_set_font_description( m_layout, m_fontdesc );
-
- pango_layout_get_pixel_size( m_layout, &w, &h );
#if 0
if ( m_backgroundMode == wxSOLID )
{
gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
- gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
+ gdk_draw_rectangle(m_window, m_textGC, TRUE, xx, yy, w, h);
gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
}
#endif
- // Draw layout.
- gs_lgp->gnome_print_moveto (m_gpc, x, y);
- if (fabs(angle) > 0.00001)
- {
- gs_lgp->gnome_print_gsave( m_gpc );
- gs_lgp->gnome_print_rotate( m_gpc, angle );
- gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
- gs_lgp->gnome_print_grestore( m_gpc );
- }
- else
- {
- gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
- }
- // reset unscaled size
- pango_font_description_set_size( m_fontdesc, oldSize );
+ // Draw layout.
+ gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy);
- // actually apply unscaled font
- pango_layout_set_font_description( m_layout, m_fontdesc );
- }
- else
- {
- pango_layout_get_pixel_size( m_layout, &w, &h );
-#if 0
- if ( m_backgroundMode == wxSOLID )
- {
- gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
- gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
- gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
- }
-#endif
- // Draw layout.
- gs_lgp->gnome_print_moveto (m_gpc, x, y);
- if (fabs(angle) > 0.00001)
- {
- gs_lgp->gnome_print_gsave( m_gpc );
- gs_lgp->gnome_print_rotate( m_gpc, angle );
- gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
- gs_lgp->gnome_print_grestore( m_gpc );
- }
- else
- {
- gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
- }
- }
+ gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+ gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS );
+
+ if (fabs(angle) > 0.00001)
+ gs_libGnomePrint->gnome_print_rotate( m_gpc, angle );
+
+ gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout );
- if (underlined)
+ int w,h;
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+
+ gs_libGnomePrint->gnome_print_grestore( m_gpc );
+
+ if (setAttrs)
{
// undo underline attributes setting:
pango_layout_set_attributes(m_layout, NULL);
}
- CalcBoundingBox (x + w, y + h);
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x + w, y + h);
}
-void wxGnomePrintDC::Clear()
+void wxGnomePrinterDCImpl::Clear()
{
}
-void wxGnomePrintDC::SetFont( const wxFont& font )
+void wxGnomePrinterDCImpl::SetFont( const wxFont& font )
{
m_font = font;
- if (m_font.Ok())
+ if (m_font.IsOk())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+ float size = pango_font_description_get_size( m_fontdesc );
+ size = size * GetFontPointSizeAdjustment(72.0);
+ pango_font_description_set_size( m_fontdesc, (gint)size );
+
pango_layout_set_font_description( m_layout, m_fontdesc );
}
}
-void wxGnomePrintDC::SetPen( const wxPen& pen )
+void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
{
- if (!pen.Ok()) return;
+ if (!pen.IsOk()) return;
m_pen = pen;
- gs_lgp->gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
+ double width;
+
+ if (m_pen.GetWidth() <= 0)
+ width = 0.1;
+ else
+ width = (double) m_pen.GetWidth();
+
+ gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, width * DEV2PS * m_scaleX );
static const double dotted[] = {2.0, 5.0};
static const double short_dashed[] = {4.0, 4.0};
switch (m_pen.GetStyle())
{
- case wxDOT: gs_lgp->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
- case wxSHORT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
- case wxLONG_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
- case wxDOT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break;
- case wxUSER_DASH:
+ case wxPENSTYLE_DOT: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+ case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+ case wxPENSTYLE_LONG_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+ case wxPENSTYLE_DOT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break;
+ case wxPENSTYLE_USER_DASH:
{
// It may be noted that libgnomeprint between at least
// versions 2.8.0 and 2.12.1 makes a copy of the dashes
int i;
for (i = 0; i < num; ++i)
g_dashes[i] = (gdouble) wx_dashes[i];
- gs_lgp -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
+ gs_libGnomePrint -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
g_free( g_dashes );
}
break;
- case wxSOLID:
- case wxTRANSPARENT:
- default: gs_lgp->gnome_print_setdash( m_gpc, 0, NULL, 0 ); break;
+ case wxPENSTYLE_SOLID:
+ case wxPENSTYLE_TRANSPARENT:
+ default: gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 ); break;
}
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
- gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+ gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
m_currentRed = red;
m_currentBlue = blue;
}
}
-void wxGnomePrintDC::SetBrush( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
{
- if (!brush.Ok()) return;
+ if (!brush.IsOk()) return;
m_brush = brush;
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
- gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+ gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
m_currentRed = red;
m_currentBlue = blue;
}
}
-void wxGnomePrintDC::SetLogicalFunction( int function )
+void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
{
}
-void wxGnomePrintDC::SetBackground( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))
{
}
-void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
+#if wxUSE_NEW_DC
+ m_clipping = TRUE; // TODO move somewhere else
+ m_clipX1 = x;
+ m_clipY1 = y;
+ m_clipX2 = x + width;
+ m_clipY2 = y + height;
+#else
+ wxDC::DoSetClippingRegion( x, y, width, height );
+#endif
+
+ gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+ gs_libGnomePrint->gnome_print_newpath( m_gpc );
+ gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+ gs_libGnomePrint->gnome_print_closepath( m_gpc );
+ gs_libGnomePrint->gnome_print_clip( m_gpc );
}
-void wxGnomePrintDC::DestroyClippingRegion()
+void wxGnomePrinterDCImpl::DestroyClippingRegion()
{
+#if wxUSE_NEW_DC
+ wxDCImpl::DestroyClippingRegion();
+#else
+ wxDC::DestroyClippingRegion();
+#endif
+
+ gs_libGnomePrint->gnome_print_grestore( m_gpc );
+
+#if 0
+ // not needed, we set the values in each
+ // drawing method anyways
+ SetPen( m_pen );
+ SetBrush( m_brush );
+ SetFont( m_font );
+#endif
}
-bool wxGnomePrintDC::StartDoc(const wxString& message)
+bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))
{
return true;
}
-void wxGnomePrintDC::EndDoc()
+void wxGnomePrinterDCImpl::EndDoc()
{
- gs_lgp->gnome_print_end_doc( m_gpc );
+ gs_libGnomePrint->gnome_print_end_doc( m_gpc );
}
-void wxGnomePrintDC::StartPage()
+void wxGnomePrinterDCImpl::StartPage()
{
- gs_lgp->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
+ gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
}
-void wxGnomePrintDC::EndPage()
+void wxGnomePrinterDCImpl::EndPage()
{
- gs_lgp->gnome_print_showpage( m_gpc );
+ gs_libGnomePrint->gnome_print_showpage( m_gpc );
}
-wxCoord wxGnomePrintDC::GetCharHeight() const
+wxCoord wxGnomePrinterDCImpl::GetCharHeight() const
{
pango_layout_set_text( m_layout, "H", 1 );
return h;
}
-wxCoord wxGnomePrintDC::GetCharWidth() const
+wxCoord wxGnomePrinterDCImpl::GetCharWidth() const
{
pango_layout_set_text( m_layout, "H", 1 );
return w;
}
-void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
wxCoord *descent,
wxCoord *externalLeading,
- wxFont *theFont ) const
+ const wxFont *theFont ) const
{
if ( width )
*width = 0;
return;
}
- // Set new font description
- if (theFont)
- pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
-
// Set layout's text
-#if wxUSE_UNICODE
- const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
- const char *dataUTF8 = (const char *)data;
-#else
- const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
- if ( !wdata )
- {
- if (width) (*width) = 0;
- if (height) (*height) = 0;
- return;
- }
- const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
- const char *dataUTF8 = (const char *)data;
-#endif
- if ( !dataUTF8 )
+ const wxScopedCharBuffer dataUTF8(string.utf8_str());
+
+ gint oldSize = 0;
+ if ( theFont )
{
- // hardly ideal, but what else can we do if conversion failed?
- return;
+ // scale the font and apply it
+ PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
+ oldSize = pango_font_description_get_size(desc);
+ float size = oldSize * GetFontPointSizeAdjustment(72.0);
+ pango_font_description_set_size(desc, (gint)size);
+
+ pango_layout_set_font_description(m_layout, desc);
}
pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h );
+ int h;
+ pango_layout_get_pixel_size( m_layout, width, &h );
+ if ( height )
+ *height = h;
- if (width)
- *width = (wxCoord)(w / m_scaleX);
- if (height)
- *height = (wxCoord)(h / m_scaleY);
if (descent)
{
PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
*descent = h - PANGO_PIXELS(baseline);
}
- // Reset old font description
- if (theFont)
- pango_layout_set_font_description( m_layout, m_fontdesc );
+ if ( theFont )
+ {
+ // restore font and reset font's size back
+ pango_layout_set_font_description(m_layout, m_fontdesc);
+
+ PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
+ pango_font_description_set_size(desc, oldSize);
+ }
}
-void wxGnomePrintDC::DoGetSize(int* width, int* height) const
+void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const
{
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_printData.GetNativeData();
// Query page size. This seems to omit the margins
double pw,ph;
- gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+ gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
if (width)
- *width = (int) (pw + 0.5);
+ *width = wxRound( pw * PS2DEV );
+
if (height)
- *height = (int) (ph + 0.5);
+ *height = wxRound( ph * PS2DEV );
}
-void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
+void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const
{
wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_printData.GetNativeData();
// This code assumes values in Pts.
double pw,ph;
- gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+ gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
// Convert to mm.
- const GnomePrintUnit *mm_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
- const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
- gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
- gs_lgp->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
+ const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+ const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+ gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+ gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
if (width)
*width = (int) (pw + 0.5);
*height = (int) (ph + 0.5);
}
-wxSize wxGnomePrintDC::GetPPI() const
+wxSize wxGnomePrinterDCImpl::GetPPI() const
{
- return wxSize(72,72);
+ return wxSize(DPI,DPI);
}
-void wxGnomePrintDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)
{
- m_signX = (xLeftRight ? 1 : -1);
- m_signY = (yBottomUp ? 1 : -1);
-
- ComputeScaleAndOrigin();
-}
+ m_printData = data;
-void wxGnomePrintDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
- wxDC::SetLogicalOrigin( x, y );
+ int height;
+ if (m_printData.GetOrientation() == wxPORTRAIT)
+ GetOwner()->GetSize( NULL, &height );
+ else
+ GetOwner()->GetSize( &height, NULL );
+ m_deviceLocalOriginY = height;
}
-void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
- wxDC::SetDeviceOrigin( x, y );
-}
+// overridden for wxPrinterDC Impl
-void wxGnomePrintDC::SetResolution(int ppi)
+int wxGnomePrinterDCImpl::GetResolution() const
{
+ return DPI;
}
-int wxGnomePrintDC::GetResolution()
+wxRect wxGnomePrinterDCImpl::GetPaperRect() const
{
- return 72;
+ // GNOME print doesn't support printer margins
+ int w = 0;
+ int h = 0;
+ DoGetSize( &w, &h );
+ return wxRect( 0, 0, w, h );
}
-
-class wxGnomePrintModule: public wxModule
-{
-public:
- wxGnomePrintModule() {}
- bool OnInit();
- void OnExit();
-
-private:
- DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
-};
+// ----------------------------------------------------------------------------
+// wxGnomePrintModule
+// ----------------------------------------------------------------------------
bool wxGnomePrintModule::OnInit()
{
- gs_lgp = new wxGnomePrintLibrary;
- if (gs_lgp->IsOk())
+ gs_libGnomePrint = new wxGnomePrintLibrary;
+ if (gs_libGnomePrint->IsOk())
wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
return true;
}
void wxGnomePrintModule::OnExit()
{
- delete gs_lgp;
+ wxDELETE(gs_libGnomePrint);
}
IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
if (paper)
{
- wxSize ScreenPixels = wxGetDisplaySize();
- wxSize ScreenMM = wxGetDisplaySizeMM();
+ m_previewPrintout->SetPPIScreen(wxGetDisplayPPI());
- m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
- (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- m_previewPrintout->SetPPIPrinter(wxGnomePrintDC::GetResolution(), wxGnomePrintDC::GetResolution());
+ int resolution = DPI;
+ m_previewPrintout->SetPPIPrinter( resolution, resolution );
wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
-
- // TODO: get better resolution information from wxGnomePrintDC, if possible.
- sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrintDC::GetResolution() / 72.0);
- sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGnomePrintDC::GetResolution() / 72.0);
+ // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible.
+
+ sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
+ sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);
wxSize sizeTenthsMM(paper->GetSize());
wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
// At 100%, the page should look about page-size on the screen.
- m_previewScaleX = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution();
+ m_previewScaleX = (double)0.8 * 72.0 / (double)resolution;
m_previewScaleY = m_previewScaleX;
}
}
projects / wxWidgets.git / blobdiff