Patch level : 10.0
Files correlati : xvaga Ricompilazione Demo : [ ] Commento : Nuova gestion ebarra di stato git-svn-id: svn://10.65.10.50/trunk@17074 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
dd8f688115
commit
cf0236f7ff
@ -4515,12 +4515,12 @@ WINDOW statbar_create(int cid, int left, int top, int right, int bottom,
|
||||
if (w != NULL)
|
||||
{
|
||||
const int nStyle = 0; // not wxST_SIZEGRIP
|
||||
pStatusBar = w->CreateStatusBar(2, nStyle);
|
||||
pStatusBar = w->CreateStatusBar(3, nStyle);
|
||||
if (pStatusBar != NULL)
|
||||
{
|
||||
const wxSize sz = pStatusBar->GetSize();
|
||||
const int widths[2] = { -1, 320 };
|
||||
pStatusBar->SetStatusWidths(2, widths);
|
||||
const int widths[4] = { -1, sz.x/4, sz.x/4, 0 };
|
||||
pStatusBar->SetStatusWidths(3, widths);
|
||||
}
|
||||
}
|
||||
return (WINDOW)pStatusBar;
|
||||
|
@ -150,7 +150,6 @@ void TwxPrintOut::ResetDC()
|
||||
|
||||
|
||||
static void RCD2data(const TPRINT_RCD* prcd, wxPrintData& data)
|
||||
|
||||
{
|
||||
#ifdef WIN32
|
||||
wxWindowsPrintNativeData ndb;
|
||||
@ -301,7 +300,6 @@ unsigned long TwxPrintOutCache::Signature(const TPRINT_RCD* prcd) const
|
||||
const unsigned long i = h & 0xC0000000;
|
||||
if (i) h = (h ^ (i >> 12)) & 0x3FFFFFFF;
|
||||
}
|
||||
|
||||
}
|
||||
return h;
|
||||
}
|
||||
@ -393,16 +391,22 @@ BOOLEAN xvt_app_escape(int esc_code, PRINT_RCD* rcd, long* ph, long* pw, long* p
|
||||
switch (esc_code)
|
||||
{
|
||||
case XVT_ESC_GET_PRINTER_INFO:
|
||||
*ph = *pw = *pvr = *phr = 0;
|
||||
if (ph) *ph = *pw = 0;
|
||||
if (pvr) *pvr = *phr = 0;
|
||||
if (rcd == NULL || xvt_print_is_valid(rcd))
|
||||
{
|
||||
const TwxPrintOut& po = m_PrintoutCache.Get((TPRINT_RCD*)rcd);
|
||||
int w, h;
|
||||
po.GetPPIPrinter(&w, &h);
|
||||
*phr = w; *pvr = h;
|
||||
if (ph)
|
||||
{
|
||||
po.GetPageSizePixels(&w, &h);
|
||||
*pw = w; *ph = h;
|
||||
|
||||
}
|
||||
if (pvr)
|
||||
{
|
||||
po.GetPPIPrinter(&w, &h);
|
||||
*phr = w; *pvr = h;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user