Skip to content

C
core
Kaydet (Commit) cda4a293 authored tarafından Korrawit Pruegsanusak's avatar Korrawit Pruegsanusak Kaydeden (comit) Noel Power
Dosyalara gözat
Seçenekler

Code cleanup 

* Remove dead code lying since 2001
* Remove duplicate if checking
* So unindent the code

Released under LGPLv3+/MPL
üst da94363e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 51 deletions
vcl/win/source/window/salobj.cxx
Dosyayı görüntüle @ cda4a293
...@@ -543,58 +543,27 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) ...@@ -543,58 +543,27 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
if ( !pSalData->mbObjClassInit ) if ( !pSalData->mbObjClassInit )
{ {
// #95301# shockwave plugin has bug; expects ASCII functions to be used WNDCLASSEXA aWndClassEx;
if ( false )//aSalShlData.mbWNT ) aWndClassEx.cbSize = sizeof( aWndClassEx );
aWndClassEx.style = 0;
aWndClassEx.lpfnWndProc = SalSysObjWndProcA;
aWndClassEx.cbClsExtra = 0;
aWndClassEx.cbWndExtra = SAL_OBJECT_WNDEXTRA;
aWndClassEx.hInstance = pSalData->mhInst;
aWndClassEx.hIcon = 0;
aWndClassEx.hIconSm = 0;
aWndClassEx.hCursor = LoadCursor( 0, IDC_ARROW );
aWndClassEx.hbrBackground = 0;
aWndClassEx.lpszMenuName = 0;
aWndClassEx.lpszClassName = SAL_OBJECT_CLASSNAMEA;
if ( RegisterClassExA( &aWndClassEx ) )
{ {
WNDCLASSEXW aWndClassEx; // Clean background first because of plugins.
aWndClassEx.cbSize = sizeof( aWndClassEx ); aWndClassEx.cbWndExtra = 0;
aWndClassEx.style = 0; aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
aWndClassEx.lpfnWndProc = SalSysObjWndProcW; aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA;
aWndClassEx.cbClsExtra = 0; aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA;
aWndClassEx.cbWndExtra = SAL_OBJECT_WNDEXTRA; pSalData->mbObjClassInit = TRUE;
aWndClassEx.hInstance = pSalData->mhInst;
aWndClassEx.hIcon = 0;
aWndClassEx.hIconSm = 0;
aWndClassEx.hCursor = LoadCursor( 0, IDC_ARROW );
aWndClassEx.hbrBackground = 0;
aWndClassEx.lpszMenuName = 0;
aWndClassEx.lpszClassName = SAL_OBJECT_CLASSNAMEW;
if ( RegisterClassExW( &aWndClassEx ) )
{
// Wegen PlugIn's loeschen wir erstmal den Hintergrund
aWndClassEx.cbWndExtra = 0;
aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
aWndClassEx.lpfnWndProc = SalSysObjChildWndProcW;
aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEW;
if ( RegisterClassExW( &aWndClassEx ) )
pSalData->mbObjClassInit = TRUE;
}
}
else
{
WNDCLASSEXA aWndClassEx;
aWndClassEx.cbSize = sizeof( aWndClassEx );
aWndClassEx.style = 0;
aWndClassEx.lpfnWndProc = SalSysObjWndProcA;
aWndClassEx.cbClsExtra = 0;
aWndClassEx.cbWndExtra = SAL_OBJECT_WNDEXTRA;
aWndClassEx.hInstance = pSalData->mhInst;
aWndClassEx.hIcon = 0;
aWndClassEx.hIconSm = 0;
aWndClassEx.hCursor = LoadCursor( 0, IDC_ARROW );
aWndClassEx.hbrBackground = 0;
aWndClassEx.lpszMenuName = 0;
aWndClassEx.lpszClassName = SAL_OBJECT_CLASSNAMEA;
if ( RegisterClassExA( &aWndClassEx ) )
{
// Wegen PlugIn's loeschen wir erstmal den Hintergrund
aWndClassEx.cbWndExtra = 0;
aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA;
aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA;
if ( RegisterClassExA( &aWndClassEx ) )
pSalData->mbObjClassInit = TRUE;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment