Michaël Van Canneyt пре 2 година
родитељ
комит
a1466c7057
2 измењених фајлова са 90 додато и 90 уклоњено
  1. 4 4
      packages/newt/examples/newt3.pas
  2. 86 86
      packages/newt/src/newt.pp

+ 4 - 4
packages/newt/examples/newt3.pas

@@ -7,8 +7,8 @@ var
 
     form, labelC, entry, button : newtComponent;
     S: ansiString;
-    P: Pchar;
-    machaine :string;
+    P: PAnsiChar;
+    machine :ansistring;
 begin
 
     newtInit();
@@ -18,9 +18,9 @@ begin
 
     labelC := newtLabel(1, 1, 'Enter a string');
 
-    p:=addr(machaine[1]);
+    p:=addr(machine[1]);
     s:='Sample';
-    entry := newtEntry(16,1,PChar(S),20,@P,NEWT_FLAG_SCROLL OR NEWT_FLAG_RETURNEXIT);
+    entry := newtEntry(16,1,PAnsiChar(S),20,@P,NEWT_FLAG_SCROLL OR NEWT_FLAG_RETURNEXIT);
 
 
     button := newtButton(17, 3, 'Ok');

+ 86 - 86
packages/newt/src/newt.pp

@@ -41,50 +41,50 @@ const
 
 type
   newtColors = record
-    rootFg : ^char;
-    rootBg : ^char;
-    borderFg : ^char;
-    borderBg : ^char;
-    windowFg : ^char;
-    windowBg : ^char;
-    shadowFg : ^char;
-    shadowBg : ^char;
-    titleFg : ^char;
-    titleBg : ^char;
-    buttonFg : ^char;
-    buttonBg : ^char;
-    actButtonFg : ^char;
-    actButtonBg : ^char;
-    checkboxFg : ^char;
-    checkboxBg : ^char;
-    actCheckboxFg : ^char;
-    actCheckboxBg : ^char;
-    entryFg : ^char;
-    entryBg : ^char;
-    labelFg : ^char;
-    labelBg : ^char;
-    listboxFg : ^char;
-    listboxBg : ^char;
-    actListboxFg : ^char;
-    actListboxBg : ^char;
-    textboxFg : ^char;
-    textboxBg : ^char;
-    actTextboxFg : ^char;
-    actTextboxBg : ^char;
-    helpLineFg : ^char;
-    helpLineBg : ^char;
-    rootTextFg : ^char;
-    rootTextBg : ^char;
-    emptyScale : ^char;
-    fullScale : ^char;
-    disabledEntryFg : ^char;
-    disabledEntryBg : ^char;
-    compactButtonFg : ^char;
-    compactButtonBg : ^char;
-    actSelListboxFg : ^char;
-    actSelListboxBg : ^char;
-    selListboxFg : ^char;
-    selListboxBg : ^char;
+    rootFg : ^AnsiChar;
+    rootBg : ^AnsiChar;
+    borderFg : ^AnsiChar;
+    borderBg : ^AnsiChar;
+    windowFg : ^AnsiChar;
+    windowBg : ^AnsiChar;
+    shadowFg : ^AnsiChar;
+    shadowBg : ^AnsiChar;
+    titleFg : ^AnsiChar;
+    titleBg : ^AnsiChar;
+    buttonFg : ^AnsiChar;
+    buttonBg : ^AnsiChar;
+    actButtonFg : ^AnsiChar;
+    actButtonBg : ^AnsiChar;
+    checkboxFg : ^AnsiChar;
+    checkboxBg : ^AnsiChar;
+    actCheckboxFg : ^AnsiChar;
+    actCheckboxBg : ^AnsiChar;
+    entryFg : ^AnsiChar;
+    entryBg : ^AnsiChar;
+    labelFg : ^AnsiChar;
+    labelBg : ^AnsiChar;
+    listboxFg : ^AnsiChar;
+    listboxBg : ^AnsiChar;
+    actListboxFg : ^AnsiChar;
+    actListboxBg : ^AnsiChar;
+    textboxFg : ^AnsiChar;
+    textboxBg : ^AnsiChar;
+    actTextboxFg : ^AnsiChar;
+    actTextboxBg : ^AnsiChar;
+    helpLineFg : ^AnsiChar;
+    helpLineBg : ^AnsiChar;
+    rootTextFg : ^AnsiChar;
+    rootTextBg : ^AnsiChar;
+    emptyScale : ^AnsiChar;
+    fullScale : ^AnsiChar;
+    disabledEntryFg : ^AnsiChar;
+    disabledEntryBg : ^AnsiChar;
+    compactButtonFg : ^AnsiChar;
+    compactButtonBg : ^AnsiChar;
+    actSelListboxFg : ^AnsiChar;
+    actSelListboxBg : ^AnsiChar;
+    selListboxFg : ^AnsiChar;
+    selListboxBg : ^AnsiChar;
   end;
   newtFlagsSense = (NEWT_FLAGS_SET,NEWT_FLAGS_RESET,NEWT_FLAGS_TOGGLE );
 
@@ -177,8 +177,8 @@ type
   newtGridElement = (NEWT_GRID_EMPTY := 0,NEWT_GRID_COMPONENT, NEWT_GRID_SUBGRID);
 
   newtWinEntry = record
-    text : pchar;
-    value : ppchar;
+    text : PAnsiChar;
+    value : PPAnsiChar;
     flags : longint;
   end;
   PnewtWinEntry = ^newtWinEntry;
@@ -193,65 +193,65 @@ procedure newtResizeScreen(redraw:longint);  cdecl; external newtlib;
 procedure newtWaitForKey; cdecl; external newtlib;
 procedure newtClearKeyBuffer; cdecl; external newtlib;
 procedure newtDelay(usecs:longint); cdecl; external newtlib;
-function newtOpenWindow(left:longint; top:longint; width:longint; height:longint; title:Pchar):longint;cdecl; external newtlib;
-function newtCenteredWindow(width:longint; height:longint; title:Pchar):longint; cdecl; external newtlib;
+function newtOpenWindow(left:longint; top:longint; width:longint; height:longint; title:PAnsiChar):longint;cdecl; external newtlib;
+function newtCenteredWindow(width:longint; height:longint; title:PAnsiChar):longint; cdecl; external newtlib;
 procedure newtPopWindow; cdecl; external newtlib;
 procedure newtSetColors(colors:newtColors); cdecl; external newtlib;
 procedure newtRefresh; cdecl; external newtlib;
 procedure newtSuspend; cdecl; external newtlib;
 procedure newtSetSuspendCallback(cb:newtSuspendCallback; data:pointer);cdecl; external newtlib;
 procedure newtResume;cdecl; external newtlib;
-procedure newtPushHelpLine(text:Pchar); cdecl; external newtlib;
+procedure newtPushHelpLine(text:PAnsiChar); cdecl; external newtlib;
 procedure newtRedrawHelpLine; cdecl; external newtlib;
 procedure newtPopHelpLine; cdecl; external newtlib;
-procedure newtDrawRootText(col:longint; row:longint; text:Pchar); cdecl; external newtlib;
+procedure newtDrawRootText(col:longint; row:longint; text:PAnsiChar); cdecl; external newtlib;
 procedure newtBell; cdecl; external newtlib;
-function newtCompactButton(left:longint; top:longint; text:Pchar):newtComponent; cdecl; external newtlib;
-function newtButton(left:longint; top:longint; text:Pchar):newtComponent; cdecl; external newtlib;
-function newtCheckbox(left:longint; top:longint; text:Pchar; defValue:char; seq:Pchar;  aresult:Pchar):newtComponent;  cdecl; external newtlib;
-function newtCheckboxGetValue(co:newtComponent):char; cdecl; external newtlib;
-procedure newtCheckboxSetValue(co:newtComponent; value:char); cdecl; external newtlib;
+function newtCompactButton(left:longint; top:longint; text:PAnsiChar):newtComponent; cdecl; external newtlib;
+function newtButton(left:longint; top:longint; text:PAnsiChar):newtComponent; cdecl; external newtlib;
+function newtCheckbox(left:longint; top:longint; text:PAnsiChar; defValue:AnsiChar; seq:PAnsiChar;  aresult:PAnsiChar):newtComponent;  cdecl; external newtlib;
+function newtCheckboxGetValue(co:newtComponent):AnsiChar; cdecl; external newtlib;
+procedure newtCheckboxSetValue(co:newtComponent; value:AnsiChar); cdecl; external newtlib;
 procedure newtCheckboxSetFlags(co:newtComponent; flags:longint; sense:newtFlagsSense); cdecl; external newtlib;
-function newtRadiobutton(left:longint; top:longint; text:Pchar; isDefault:longint; prevButton:newtComponent):newtComponent; cdecl; external newtlib;
+function newtRadiobutton(left:longint; top:longint; text:PAnsiChar; isDefault:longint; prevButton:newtComponent):newtComponent; cdecl; external newtlib;
 function newtRadioGetCurrent(setMember:newtComponent):newtComponent; cdecl; external newtlib;
-function newtListitem(left:longint; top:longint; text:Pchar; isDefault:longint; prevItem:newtComponent; data:pointer; flags:longint):newtComponent;cdecl; external newtlib;
-procedure newtListitemSet(co:newtComponent; text:Pchar); cdecl; external newtlib;
+function newtListitem(left:longint; top:longint; text:PAnsiChar; isDefault:longint; prevItem:newtComponent; data:pointer; flags:longint):newtComponent;cdecl; external newtlib;
+procedure newtListitemSet(co:newtComponent; text:PAnsiChar); cdecl; external newtlib;
 function newtListitemGetData(co:newtComponent):pointer; cdecl; external newtlib;
 procedure newtGetScreenSize(cols:Plongint; rows:Plongint); cdecl; external newtlib;
-function newtLabel(left:longint; top:longint; text:Pchar):newtComponent; cdecl; external newtlib;
-procedure newtLabelSetText(co:newtComponent; text:Pchar); cdecl; external newtlib;
+function newtLabel(left:longint; top:longint; text:PAnsiChar):newtComponent; cdecl; external newtlib;
+procedure newtLabelSetText(co:newtComponent; text:PAnsiChar); cdecl; external newtlib;
 function newtVerticalScrollbar(left:longint; top:longint; height:longint; normalColorset:longint; thumbColorset:longint):newtComponent; cdecl; external newtlib;
 procedure newtScrollbarSet(co:newtComponent; where:longint; total:longint); cdecl; external newtlib;
 function newtListbox(left:longint; top:longint; height:longint; flags:longint):newtComponent; cdecl; external newtlib;
 function newtListboxGetCurrent(co:newtComponent):pointer; cdecl; external newtlib;
 procedure newtListboxSetCurrent(co:newtComponent; num:longint); cdecl; external newtlib;
 procedure newtListboxSetCurrentByKey(co:newtComponent; key:pointer); cdecl; external newtlib;
-procedure newtListboxSetEntry(co:newtComponent; num:longint; text:Pchar); cdecl; external newtlib;
+procedure newtListboxSetEntry(co:newtComponent; num:longint; text:PAnsiChar); cdecl; external newtlib;
 procedure newtListboxSetWidth(co:newtComponent; width:longint); cdecl; external newtlib;
 procedure newtListboxSetData(co:newtComponent; num:longint; data:pointer); cdecl; external newtlib;
-function newtListboxAppendEntry(co:newtComponent; text:Pchar; data:pointer):longint; cdecl; external newtlib;
-function newtListboxInsertEntry(co:newtComponent; text:Pchar; data:pointer; key:pointer):longint; cdecl; external newtlib;
+function newtListboxAppendEntry(co:newtComponent; text:PAnsiChar; data:pointer):longint; cdecl; external newtlib;
+function newtListboxInsertEntry(co:newtComponent; text:PAnsiChar; data:pointer; key:pointer):longint; cdecl; external newtlib;
 function newtListboxDeleteEntry(co:newtComponent; data:pointer):longint; cdecl; external newtlib;
 procedure newtListboxClear(co:newtComponent); cdecl; external newtlib;
-procedure newtListboxGetEntry(co:newtComponent; num:longint; text:PPchar; data:Ppointer); cdecl; external newtlib;
+procedure newtListboxGetEntry(co:newtComponent; num:longint; text:PPAnsiChar; data:Ppointer); cdecl; external newtlib;
 function newtListboxGetSelection(co:newtComponent; numitems:Plongint): ppointer; cdecl; external newtlib;
 procedure newtListboxClearSelection(co:newtComponent); cdecl; external newtlib;
 procedure newtListboxSelectItem(co:newtComponent; key:pointer; sense:newtFlagsSense); cdecl; external newtlib;
 function newtCheckboxTree(left:longint; top:longint; height:longint; flags:longint):newtComponent; cdecl; external newtlib;
-function newtCheckboxTreeMulti(left:longint; top:longint; height:longint; seq:Pchar; flags:longint):newtComponent; cdecl; external newtlib;
+function newtCheckboxTreeMulti(left:longint; top:longint; height:longint; seq:PAnsiChar; flags:longint):newtComponent; cdecl; external newtlib;
 function newtCheckboxTreeGetSelection(co:newtComponent; numitems:Plongint): ppointer; cdecl; external newtlib;
 function newtCheckboxTreeGetCurrent(co:newtComponent):pointer; cdecl; external newtlib;
-function newtCheckboxTreeGetMultiSelection(co:newtComponent; numitems:Plongint; seqnum:char): ppointer; cdecl; external newtlib;
-function newtCheckboxTreeAddItem(co:newtComponent; text:Pchar; data:pointer; flags:longint; index:longint):longint; cdecl; varargs; external newtlib;
-function newtCheckboxTreeAddArray(co:newtComponent; text:Pchar; data:pointer; flags:longint; indexes:Plongint):longint;  cdecl; external newtlib;
+function newtCheckboxTreeGetMultiSelection(co:newtComponent; numitems:Plongint; seqnum:AnsiChar): ppointer; cdecl; external newtlib;
+function newtCheckboxTreeAddItem(co:newtComponent; text:PAnsiChar; data:pointer; flags:longint; index:longint):longint; cdecl; varargs; external newtlib;
+function newtCheckboxTreeAddArray(co:newtComponent; text:PAnsiChar; data:pointer; flags:longint; indexes:Plongint):longint;  cdecl; external newtlib;
 function newtCheckboxTreeFindItem(co:newtComponent; data:pointer):plongint;  cdecl; external newtlib;
-function newtTextboxReflowed(left:longint; top:longint; text:Pchar; width:longint; flexDown:longint; flexUp:longint; flags:longint):newtComponent;  cdecl; external newtlib;
+function newtTextboxReflowed(left:longint; top:longint; text:PAnsiChar; width:longint; flexDown:longint; flexUp:longint; flags:longint):newtComponent;  cdecl; external newtlib;
 function newtTextbox(left:longint; top:longint; width:longint; height:longint; flags:longint):newtComponent;  cdecl; external newtlib;
-procedure newtTextboxSetText(co:newtComponent; text:Pchar);  cdecl; external newtlib;
+procedure newtTextboxSetText(co:newtComponent; text:PAnsiChar);  cdecl; external newtlib;
 procedure newtTextboxSetHeight(co:newtComponent; height:longint);  cdecl; external newtlib;
 function newtTextboxGetNumLines(co:newtComponent):longint;  cdecl; external newtlib;
-function newtReflowText(text:Pchar; width:longint; flexDown:longint; flexUp:longint; actualWidth:Plongint; actualHeight:Plongint):pchar;  cdecl; external newtlib;
-function newtForm(vertBar:newtComponent; help:Pchar; flags:longint):newtComponent;  cdecl; external newtlib;
+function newtReflowText(text:PAnsiChar; width:longint; flexDown:longint; flexUp:longint; actualWidth:Plongint; actualHeight:Plongint):PAnsiChar;  cdecl; external newtlib;
+function newtForm(vertBar:newtComponent; help:PAnsiChar; flags:longint):newtComponent;  cdecl; external newtlib;
 procedure newtFormSetTimer(form:newtComponent; millisecs:longint); cdecl; external newtlib;
 procedure newtFormWatchFd(form:newtComponent; fd:longint; fdFlags:longint);  cdecl; external newtlib;
 procedure newtFormSetSize(co:newtComponent);  cdecl; external newtlib;
@@ -266,10 +266,10 @@ function newtRunForm(form:newtComponent):newtComponent;  cdecl; external newtlib
 procedure newtFormRun(co:newtComponent; es:PnewtExitStruct);   cdecl; external newtlib;
 procedure newtDrawForm(form:newtComponent);   cdecl; external newtlib;
 procedure newtFormAddHotKey(co:newtComponent; key:longint); cdecl; external newtlib;
-function newtEntry(left:longint; top:longint; initialValue:Pchar; width:longint; resultPtr:PPchar; flags:longint):newtComponent; cdecl; external newtlib;
-procedure newtEntrySet(co:newtComponent; value:Pchar; cursorAtEnd:longint);   cdecl; external newtlib;
+function newtEntry(left:longint; top:longint; initialValue:PAnsiChar; width:longint; resultPtr:PPAnsiChar; flags:longint):newtComponent; cdecl; external newtlib;
+procedure newtEntrySet(co:newtComponent; value:PAnsiChar; cursorAtEnd:longint);   cdecl; external newtlib;
 procedure newtEntrySetFilter(co:newtComponent; filter:newtEntryFilter; data:pointer);   cdecl; external newtlib;
-function newtEntryGetValue(co:newtComponent):pchar;   cdecl; external newtlib;
+function newtEntryGetValue(co:newtComponent):PAnsiChar;   cdecl; external newtlib;
 procedure newtEntrySetFlags(co:newtComponent; flags:longint; sense:newtFlagsSense);   cdecl; external newtlib;
 function newtScale(left:longint; top:longint; width:longint; fullValue:int64):newtComponent; cdecl; external newtlib;
 procedure newtScaleSet(co:newtComponent; amount:qword); cdecl; external newtlib;
@@ -289,18 +289,18 @@ procedure newtGridSetField(grid:newtGrid; col:longint; row:longint; _type:newtGr
 procedure newtGridPlace(grid:newtGrid; left:longint; top:longint);cdecl; external newtlib;
 procedure newtGridFree(grid:newtGrid; recurse:longint);cdecl; external newtlib;
 procedure newtGridGetSize(grid:newtGrid; width:Plongint; height:Plongint);cdecl; external newtlib;
-procedure newtGridWrappedWindow(grid:newtGrid; title:Pchar);cdecl; external newtlib;
-procedure newtGridWrappedWindowAt(grid:newtGrid; title:Pchar; left:longint; top:longint);cdecl; external newtlib;
+procedure newtGridWrappedWindow(grid:newtGrid; title:PAnsiChar);cdecl; external newtlib;
+procedure newtGridWrappedWindowAt(grid:newtGrid; title:PAnsiChar; left:longint; top:longint);cdecl; external newtlib;
 procedure newtGridAddComponentsToForm(grid:newtGrid; form:newtComponent; recurse:longint);cdecl; external newtlib;
-function newtButtonBarv(button1:Pchar; b1comp:PnewtComponent):newtGrid;cdecl;varargs; external newtlib;
-function newtButtonBar(button1:Pchar; b1comp:PnewtComponent):newtGrid;cdecl;varargs; external newtlib;
-procedure newtWinMessage(title:Pchar; buttonText:Pchar; text:Pchar);cdecl;varargs; external newtlib;
-procedure newtWinMessagev(title:Pchar; buttonText:Pchar; text:Pchar);cdecl;varargs; external newtlib;
-function newtWinChoice(title:Pchar; button1:Pchar; button2:Pchar; text:Pchar):longint;cdecl; varargs; external newtlib;
-function newtWinTernary(title:Pchar; button1:Pchar; button2:Pchar; button3:Pchar; message:Pchar):longint;cdecl;varargs; external newtlib;
-function newtWinMenu(title:Pchar; text:Pchar; suggestedWidth:longint; flexDown:longint; flexUp:longint;  maxListHeight:longint; items:PPchar; listItem:Plongint; button1:Pchar):longint;cdecl; varargs; external newtlib;
-function newtWinEntries(title:Pchar; text:Pchar; suggestedWidth:longint; flexDown:longint; flexUp:longint;
-               dataWidth:longint; items:PnewtWinEntry; button1:Pchar):longint;cdecl;varargs; external newtlib;
+function newtButtonBarv(button1:PAnsiChar; b1comp:PnewtComponent):newtGrid;cdecl;varargs; external newtlib;
+function newtButtonBar(button1:PAnsiChar; b1comp:PnewtComponent):newtGrid;cdecl;varargs; external newtlib;
+procedure newtWinMessage(title:PAnsiChar; buttonText:PAnsiChar; text:PAnsiChar);cdecl;varargs; external newtlib;
+procedure newtWinMessagev(title:PAnsiChar; buttonText:PAnsiChar; text:PAnsiChar);cdecl;varargs; external newtlib;
+function newtWinChoice(title:PAnsiChar; button1:PAnsiChar; button2:PAnsiChar; text:PAnsiChar):longint;cdecl; varargs; external newtlib;
+function newtWinTernary(title:PAnsiChar; button1:PAnsiChar; button2:PAnsiChar; button3:PAnsiChar; message:PAnsiChar):longint;cdecl;varargs; external newtlib;
+function newtWinMenu(title:PAnsiChar; text:PAnsiChar; suggestedWidth:longint; flexDown:longint; flexUp:longint;  maxListHeight:longint; items:PPAnsiChar; listItem:Plongint; button1:PAnsiChar):longint;cdecl; varargs; external newtlib;
+function newtWinEntries(title:PAnsiChar; text:PAnsiChar; suggestedWidth:longint; flexDown:longint; flexUp:longint;
+               dataWidth:longint; items:PnewtWinEntry; button1:PAnsiChar):longint;cdecl;varargs; external newtlib;
 
 implementation