paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 12:10:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* several -A fixes for ptcpas.

Browse Source 
* some constants with "move to windows" comment moved to windows.

git-svn-id: trunk@24709 -
This commit is contained in:
marco 2013-06-01 12:48:11 +00:00
parent c009679d82
commit 60d1a7ba13
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ptc/src/core/errori.inc
View File

@ -100,7 +100,7 @@ begin
{$IFDEF Win32} {$IFDEF Win32}
// Win32Cursor_resurrect; // Win32Cursor_resurrect;
txt := FMessage; txt := FMessage;
MessageBox(0, PChar(txt), 'Error', MB_OK or MB_ICONERROR or MB_SETFOREGROUND or MB_TOPMOST); MessageBoxA(0, PChar(txt), 'Error', MB_OK or MB_ICONERROR or MB_SETFOREGROUND or MB_TOPMOST);
{$ENDIF Win32} {$ENDIF Win32}
{$IFDEF WinCE} {$IFDEF WinCE}

26
packages/ptc/src/win32/base/win32window.inc
View File

@ -53,7 +53,7 @@ var
program_instance{, library_instance}: DWord; program_instance{, library_instance}: DWord;
rectangle: RECT; rectangle: RECT;
display_width, display_height: Integer; display_width, display_height: Integer;
wc: WNDCLASSEX; wc: WNDCLASSEXA;
begin begin
LOG('creating managed window'); LOG('creating managed window');
Defaults; Defaults;
@ -79,7 +79,7 @@ begin
wc.hCursor := LoadCursor(0, IDC_ARROW) wc.hCursor := LoadCursor(0, IDC_ARROW)
else else
wc.hCursor := 0; wc.hCursor := 0;
RegisterClassEx(wc); RegisterClassExA(wc);
with rectangle do with rectangle do
begin begin
left := 0; left := 0;
@ -111,7 +111,7 @@ begin
end end
else else
begin begin
FWindow := CreateWindowEx(FExtra, PChar(FName), PChar(FTitle), FStyle, FX, FY, FWidth, FHeight, 0, 0, 0, Self); FWindow := CreateWindowExA(FExtra, PChar(FName), PChar(FTitle), FStyle, FX, FY, FWidth, FHeight, 0, 0, 0, Self);
if not IsWindow(FWindow) then if not IsWindow(FWindow) then
raise TPTCError.Create('could not create window'); raise TPTCError.Create('could not create window');
ShowWindow(FWindow, FShow); ShowWindow(FWindow, FShow);
@ -261,7 +261,7 @@ begin
if wParam = SC_KEYMENU then if wParam = SC_KEYMENU then
Result := 0 Result := 0
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
WM_SETCURSOR: begin WM_SETCURSOR: begin
{$WARNING GCLP_HCURSOR not defined in windows unit} {$WARNING GCLP_HCURSOR not defined in windows unit}
@ -271,14 +271,14 @@ begin
Result := 1; Result := 1;
end end
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
WM_CLOSE: begin WM_CLOSE: begin
LOG('TWin32Window WM_CLOSE'); LOG('TWin32Window WM_CLOSE');
Halt(0); Halt(0);
end; end;
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
end; end;
@ -292,7 +292,7 @@ begin
if wParam = SC_KEYMENU then if wParam = SC_KEYMENU then
Result := 0 Result := 0
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
WM_SETCURSOR: begin WM_SETCURSOR: begin
{$WARNING GCLP_HCURSOR not defined in windows unit} {$WARNING GCLP_HCURSOR not defined in windows unit}
@ -302,7 +302,7 @@ begin
Result := 1; Result := 1;
end end
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
WM_DESTROY: begin WM_DESTROY: begin
LOG('TWin32Window WM_DESTROY'); LOG('TWin32Window WM_DESTROY');
@ -313,7 +313,7 @@ begin
Halt(0); Halt(0);
end; end;
else else
Result := DefWindowProc(hWnd, message, wParam, lParam); Result := DefWindowProcA(hWnd, message, wParam, lParam);
end; end;
end; end;
@ -369,7 +369,7 @@ begin
FEvent := 0; FEvent := 0;
FThread := 0; FThread := 0;
FID := 0; FID := 0;
UnregisterClass(PChar(FName), GetModuleHandle(Nil)); UnregisterClassA(PChar(FName), GetModuleHandle(Nil));
end; end;
end; end;
@ -379,7 +379,7 @@ var
begin begin
with AOwner do with AOwner do
begin begin
FWindow := CreateWindowEx(FExtra, PChar(FName), PChar(FTitle), FStyle, FX, FY, FWidth, FHeight, 0, 0, 0, nil); FWindow := CreateWindowExA(FExtra, PChar(FName), PChar(FTitle), FStyle, FX, FY, FWidth, FHeight, 0, 0, 0, nil);
if IsWindow(FWindow) then if IsWindow(FWindow) then
begin begin
ShowWindow(FWindow, FShow); ShowWindow(FWindow, FShow);
@ -399,10 +399,10 @@ end;
function TWin32Window.WMCreate(hWnd: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT; function TWin32Window.WMCreate(hWnd: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT;
begin begin
Result := DefWindowProc(hWnd, uMsg, wParam, lParam); Result := DefWindowProcA(hWnd, uMsg, wParam, lParam);
end; end;
function TWin32Window.WMDestroy(hWnd: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT; function TWin32Window.WMDestroy(hWnd: HWND; uMsg: UINT; wParam: WPARAM; lParam: LPARAM): LRESULT;
begin begin
Result := DefWindowProc(hWnd, uMsg, wParam, lParam); Result := DefWindowProcA(hWnd, uMsg, wParam, lParam);
end; end;

12
packages/ptc/src/win32/gdi/win32modesetteri.inc
View File

@ -29,18 +29,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
} }
{$WARNING add these to windows unit}
const
DISP_CHANGE_BADPARAM = -5;
DISP_CHANGE_BADDUALVIEW = -6;
DM_POSITION = $00000020;
DM_NUP = $00000040;
DM_PANNINGWIDTH = $08000000;
DM_PANNINGHEIGHT = $10000000;
DMDFO_DEFAULT = 0;
DMDFO_STRETCH = 1;
DMDFO_CENTER = 2;
constructor TWin32ModeSetter.Create; constructor TWin32ModeSetter.Create;
begin begin
SetupModeList; SetupModeList;