зеркало из https://github.com/mozilla/gecko-dev.git
r=mkaply, a=blizzard
Don't hardcode fonts for dialogs - breaks DBCS
This commit is contained in:
Родитель
14af6c2324
Коммит
8a1937849c
|
@ -273,8 +273,6 @@ MRESULT EXPENTRY fndpDirPicker( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
|
|||
// prep window
|
||||
CenterWindow( hwnd, WinQueryWindow( hwnd, QW_OWNER));
|
||||
|
||||
// XXX make dynamic, save fontnamesize
|
||||
WinSetPresParam( hwnd, PP_FONTNAMESIZE, 11, (PVOID)"9.WarpSans");
|
||||
// XXX colour for container bg?
|
||||
// XXX Do help later
|
||||
WinEnableControl( hwnd, IDD_HELPBUTTON, FALSE);
|
||||
|
|
|
@ -83,10 +83,6 @@ void nsWidgetModuleData::Init( nsIAppShell *aPrimaevalAppShell)
|
|||
// Both combobox and (atm) nsBrowserWindow depend on this.
|
||||
lHtEntryfield = 26;
|
||||
|
||||
rc = WinLoadString( 0/*hab*/, hModResources, ID_STR_FONT, 256, buffer);
|
||||
if( !rc) strcpy( buffer, "8.Helv");
|
||||
pszFontNameSize = strdup( buffer);
|
||||
|
||||
hptrSelect = hptrFrameIcon = 0;
|
||||
idSelect = 0;
|
||||
|
||||
|
@ -133,7 +129,6 @@ nsWidgetModuleData::~nsWidgetModuleData()
|
|||
WinDestroyPointer( hptrFrameIcon);
|
||||
if( hModResources)
|
||||
DosFreeModule( hModResources);
|
||||
free( pszFontNameSize);
|
||||
#if 0
|
||||
delete mWindows;
|
||||
#endif
|
||||
|
|
|
@ -131,7 +131,6 @@ class nsWidgetModuleData
|
|||
SIZEL szScreen; // size of screen in pixels
|
||||
BOOL bMouseSwitched; // true if MB1 is the RH mouse button
|
||||
LONG lHtEntryfield; // ideal height of an entryfield
|
||||
char *pszFontNameSize; // fns for default widget font
|
||||
BOOL bIsDBCS; // true if system is dbcs
|
||||
|
||||
// xptoolkit services we look after, & the primaeval appshell too.
|
||||
|
|
|
@ -859,9 +859,6 @@ void nsWindow::RealDoCreate( HWND hwndP,
|
|||
printf( "Couldn't find DC instance for nsWindow\n");
|
||||
#endif
|
||||
}
|
||||
WinSetPresParam( mWnd, PP_FONTNAMESIZE,
|
||||
strlen( gModuleData.pszFontNameSize) + 1,
|
||||
gModuleData.pszFontNameSize);
|
||||
|
||||
Resize( aRect.x, aRect.y, aRect.width, aRect.height, PR_FALSE);
|
||||
|
||||
|
|
|
@ -65,7 +65,6 @@ POINTER ID_PTR_ARROWWAIT arrow_wait.ptr
|
|||
/* stringtable */
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
ID_STR_FONT "8.Helv"
|
||||
ID_STR_HMMDIR "Cannot locate directory %s. Would you like it to be created?"
|
||||
ID_STR_NOCDIR "Could not create directory."
|
||||
END
|
||||
|
|
Загрузка…
Ссылка в новой задаче