root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :2.2 2006 399

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretti errori di riporto dalla 2.1


git-svn-id: svn://10.65.10.50/trunk@13910 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-04-14 10:35:03 +00:00
parent 21699c002e
commit e225985b7c
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xvaga/xvt.h
View File

@ -224,12 +224,12 @@ XVTDLL void xvt_print_close(void);
XVTDLL BOOLEAN xvt_print_close_page(PRINT_RCD *precp); XVTDLL BOOLEAN xvt_print_close_page(PRINT_RCD *precp);
XVTDLL PRINT_RCD* xvt_print_create(int *sizep); XVTDLL PRINT_RCD* xvt_print_create(int *sizep);
XVTDLL PRINT_RCD* xvt_print_create_by_name(int* sizep, const char* name); // Added by Aga XVTDLL PRINT_RCD* xvt_print_create_by_name(int* sizep, const char* name); // Added by Aga
XVTDLL int xvt_print_get_name(PRINT_RCD *precp, char* name, int sz_s); // Added by Aga XVTDLL int xvt_print_get_name(const PRINT_RCD *precp, char* name, int sz_s); // Added by Aga
XVTDLL WINDOW xvt_print_create_win(PRINT_RCD *precp, const char* title); XVTDLL WINDOW xvt_print_create_win(PRINT_RCD *precp, const char* title);
XVTDLL void xvt_print_destroy(PRINT_RCD *precp); XVTDLL void xvt_print_destroy(PRINT_RCD *precp);
XVTDLL RCT* xvt_print_get_next_band(void); XVTDLL RCT* xvt_print_get_next_band(void);
XVTDLL BOOLEAN xvt_print_is_valid(PRINT_RCD *precp); XVTDLL BOOLEAN xvt_print_is_valid(const PRINT_RCD *precp);
XVTDLL BOOLEAN xvt_print_open(void); XVTDLL BOOLEAN xvt_print_open(void);
XVTDLL BOOLEAN xvt_print_start_thread (BOOLEAN (* print_fcn)(long), long data); XVTDLL BOOLEAN xvt_print_start_thread (BOOLEAN (* print_fcn)(long), long data);
XVTDLL BOOLEAN xvt_print_open_page(PRINT_RCD *precp); XVTDLL BOOLEAN xvt_print_open_page(PRINT_RCD *precp);

26
xvaga/xvtextra.cpp
View File

@ -177,15 +177,11 @@ wxDC* TwxPrintOut::CreateDC(const TPRINT_RCD* prcd)
wxPrintData data; wxPrintData data;
RCD2data(prcd, data); RCD2data(prcd, data);
#ifdef WIN32 #ifdef WIN32
data.SetNativeData(OsWin32_ConvertToNativePrinterInfo(prcd->m_data, prcd->m_size));
data.ConvertFromNative();
// E' assolutamente necessario risalire al nome "lungo" della stampante // E' assolutamente necessario risalire al nome "lungo" della stampante
char strName[MAX_PATH]; char strName[MAX_PATH];
xvt_print_get_name(prcd, strName, sizeof(strName)); xvt_print_get_name(prcd, strName, sizeof(strName));
data.SetPrinterName(strName); data.SetPrinterName(strName);
dc = new wxPrinterDC(data); dc = new wxPrinterDC(data);
#else #else
dc = new wxPostScriptDC(data); dc = new wxPostScriptDC(data);
@ -639,7 +635,7 @@ RCT* xvt_print_get_next_band(void)
return &rct; return &rct;
} }
BOOLEAN xvt_print_is_valid(PRINT_RCD* precp) BOOLEAN xvt_print_is_valid(const PRINT_RCD* precp)
{ {
BOOLEAN ok = precp != NULL && precp->pr == NULL; BOOLEAN ok = precp != NULL && precp->pr == NULL;
if (ok) if (ok)
@ -657,7 +653,7 @@ BOOLEAN xvt_print_is_valid(PRINT_RCD* precp)
return ok; return ok;
} }
int xvt_print_get_name(PRINT_RCD* precp, char* name, int sz_s) int xvt_print_get_name(const PRINT_RCD* precp, char* name, int sz_s)
{ {
if (!xvt_print_is_valid(precp)) if (!xvt_print_is_valid(precp))
return 0; return 0;
@ -764,24 +760,22 @@ BOOLEAN xvt_print_start_thread(BOOLEAN(*print_fcn)(long), long data)
BOOLEAN xvt_print_suspend_thread() BOOLEAN xvt_print_suspend_thread()
{ {
BOOLEAN ok = m_po != NULL; BOOLEAN ok = m_PrintoutCache.Printing();
if (ok) if (ok)
{ {
m_po->OnEndDocument(); // Sembra generare una pagina vuota indesiderata TwxPrintOut& po = m_PrintoutCache.Get(NULL); // Sembra generare una pagina vuota indesiderata
m_po->OnEndPrinting(); po.OnEndPrinting();
} }
return ok; return ok;
} }
BOOLEAN xvt_print_restart_thread() BOOLEAN xvt_print_restart_thread()
{ {
BOOLEAN ok = m_po != NULL; TwxPrintOut& po = m_PrintoutCache.Get(NULL);
if (ok) po.OnBeginPrinting();
{ po.OnBeginDocument(1, 32000);
m_po->OnBeginPrinting();
m_po->OnBeginDocument(1, 32000); return TRUE;
}
return ok;
} }
BOOLEAN xvt_print_open_page(PRINT_RCD* precp) BOOLEAN xvt_print_open_page(PRINT_RCD* precp)