diff options
| -rw-r--r-- | doc/fl_copy_surface.html | 2 | ||||
| -rw-r--r-- | doc/fl_image_surface.html | 2 | ||||
| -rw-r--r-- | doc/fl_paged_device.html | 45 | ||||
| -rw-r--r-- | doc/fl_printer.html | 5 | ||||
| -rw-r--r-- | doc/fl_surface_device.html | 2 | ||||
| -rw-r--r-- | doc/index.html | 10 | ||||
| -rw-r--r-- | src/fltk-devices-surface-copy.adb (renamed from src/fltk-devices-surfaces-copy.adb) | 5 | ||||
| -rw-r--r-- | src/fltk-devices-surface-copy.ads (renamed from src/fltk-devices-surfaces-copy.ads) | 9 | ||||
| -rw-r--r-- | src/fltk-devices-surface-image.adb (renamed from src/fltk-devices-surfaces-image.adb) | 5 | ||||
| -rw-r--r-- | src/fltk-devices-surface-image.ads (renamed from src/fltk-devices-surfaces-image.ads) | 10 | ||||
| -rw-r--r-- | src/fltk-devices-surface-paged-printers.adb (renamed from src/fltk-devices-surfaces-paged-printers.adb) | 5 | ||||
| -rw-r--r-- | src/fltk-devices-surface-paged-printers.ads (renamed from src/fltk-devices-surfaces-paged-printers.ads) | 14 | ||||
| -rw-r--r-- | src/fltk-devices-surface-paged.adb (renamed from src/fltk-devices-surfaces-paged.adb) | 45 | ||||
| -rw-r--r-- | src/fltk-devices-surface-paged.ads (renamed from src/fltk-devices-surfaces-paged.ads) | 53 | ||||
| -rw-r--r-- | src/fltk-devices-surface.adb (renamed from src/fltk-devices-surfaces.adb) | 5 | ||||
| -rw-r--r-- | src/fltk-devices-surface.ads (renamed from src/fltk-devices-surfaces.ads) | 11 |
16 files changed, 109 insertions, 119 deletions
diff --git a/doc/fl_copy_surface.html b/doc/fl_copy_surface.html index 65c78a5..c022c79 100644 --- a/doc/fl_copy_surface.html +++ b/doc/fl_copy_surface.html @@ -21,7 +21,7 @@ <tr> <td>Fl_Copy_Surface</td> - <td>FLTK.Devices.Surfaces.Copy</td> + <td>FLTK.Devices.Surface.Copy</td> </tr> </table> diff --git a/doc/fl_image_surface.html b/doc/fl_image_surface.html index 8b4036e..612fe99 100644 --- a/doc/fl_image_surface.html +++ b/doc/fl_image_surface.html @@ -21,7 +21,7 @@ <tr> <td>Fl_Image_Surface</td> - <td>FLTK.Devices.Surfaces.Image</td> + <td>FLTK.Devices.Surface.Image</td> </tr> </table> diff --git a/doc/fl_paged_device.html b/doc/fl_paged_device.html index 1b2a9d9..42926f9 100644 --- a/doc/fl_paged_device.html +++ b/doc/fl_paged_device.html @@ -21,7 +21,7 @@ <tr> <td>Fl_Paged_Device</td> - <td>FLTK.Devices.Surfaces.Paged</td> + <td>FLTK.Devices.Surface.Paged</td> </tr> </table> @@ -33,12 +33,12 @@ <tr> <td>Fl_Paged_Device</td> - <td>Paged_Surface</td> + <td>Paged_Device</td> </tr> <tr> <td> </td> - <td>Paged_Surface_Reference</td> + <td>Paged_Device_Reference</td> </tr> <tr> @@ -64,7 +64,7 @@ Fl_Paged_Device(); </pre></td> <td><pre> function Create - return Paged_Surface; + return Paged_Device; </pre></td> </tr> @@ -81,7 +81,7 @@ virtual void end_job(void); </pre></td> <td><pre> procedure End_Job - (This : in out Paged_Surface); + (This : in out Paged_Device); </pre></td> </tr> @@ -91,7 +91,7 @@ virtual int end_page(void); </pre></td> <td><pre> procedure End_Page - (This : in out Paged_Surface); + (This : in out Paged_Device); </pre></td> </tr> @@ -101,7 +101,7 @@ virtual void margins(int *left, int *top, int *right, int *bottom); </pre></td> <td><pre> procedure Get_Margins - (This : in Paged_Surface; + (This : in Paged_Device; Left, Top, Right, Bottom : out Integer); </pre></td> </tr> @@ -112,7 +112,7 @@ virtual void origin(int x, int y); </pre></td> <td><pre> procedure Set_Origin - (This : in out Paged_Surface; + (This : in out Paged_Device; X, Y : in Integer); </pre></td> </tr> @@ -123,7 +123,7 @@ virtual void origin(int *x, int *y); </pre></td> <td><pre> procedure Get_Origin - (This : in Paged_Surface; + (This : in Paged_Device; X, Y : out Integer); </pre></td> </tr> @@ -134,7 +134,7 @@ virtual void print_widget(Fl_Widget *widget, int delta_x=0, int delta_y=0); </pre></td> <td><pre> procedure Print_Widget - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Widget'Class; Offset_X, Offset_Y : in Integer := 0); </pre></td> @@ -146,7 +146,7 @@ void print_window(Fl_Window *win, int x_offset=0, int y_offset=0); </pre></td> <td><pre> procedure Print_Window - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; Offset_X, Offset_Y : in Integer := 0); </pre></td> @@ -154,11 +154,12 @@ procedure Print_Window <tr> <td><pre> -virtual void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x=0, int delta_y=0); +virtual void print_window_part(Fl_Window *win, int x, int y, int w, + int h, int delta_x=0, int delta_y=0); </pre></td> <td><pre> procedure Print_Window_Part - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; X, Y, W, H : in Integer; Offset_X, Offset_Y : in Integer := 0); @@ -171,7 +172,7 @@ virtual int printable_rect(int *w, int *h); </pre></td> <td><pre> procedure Get_Printable_Rect - (This : in Paged_Surface; + (This : in Paged_Device; W, H : out Integer); </pre></td> </tr> @@ -182,7 +183,7 @@ virtual void rotate(float angle); </pre></td> <td><pre> procedure Rotate - (This : in out Paged_Surface; + (This : in out Paged_Device; Degrees : in Float); </pre></td> </tr> @@ -193,11 +194,11 @@ virtual void scale(float scale_x, float scale_y=0); </pre></td> <td><pre> procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor : in Float); procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor_X, Factor_Y : in Float); </pre></td> </tr> @@ -208,11 +209,11 @@ virtual int start_job(int pagecount, int *frompage=NULL, int *topage=NULL); </pre></td> <td><pre> procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural); procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural; From, To : in Positive); </pre></td> @@ -224,7 +225,7 @@ virtual int start_page(void); </pre></td> <td><pre> procedure Start_Page - (This : in out Paged_Surface); + (This : in out Paged_Device); </pre></td> </tr> @@ -234,7 +235,7 @@ virtual void translate(int x, int y); </pre></td> <td><pre> procedure Translate - (This : in out Paged_Surface; + (This : in out Paged_Device; Delta_X, Delta_Y : in Integer); </pre></td> </tr> @@ -245,7 +246,7 @@ virtual void untranslate(void); </pre></td> <td><pre> procedure Untranslate - (This : in out Paged_Surface); + (This : in out Paged_Device); </pre></td> </tr> diff --git a/doc/fl_printer.html b/doc/fl_printer.html index e827131..55c2d3e 100644 --- a/doc/fl_printer.html +++ b/doc/fl_printer.html @@ -21,7 +21,7 @@ <tr> <td>Fl_Printer</td> - <td>FLTK.Devices.Surfaces.Paged.Printers</td> + <td>FLTK.Devices.Surface.Paged.Printers</td> </tr> </table> @@ -139,7 +139,8 @@ procedure Print_Widget <tr> <td><pre> -void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x=0, int delta_y=0); +void print_window_part(Fl_Window *win, int x, int y, int w, int h, + int delta_x=0, int delta_y=0); </pre></td> <td><pre> procedure Print_Window_Part diff --git a/doc/fl_surface_device.html b/doc/fl_surface_device.html index 548b198..f4fa6e4 100644 --- a/doc/fl_surface_device.html +++ b/doc/fl_surface_device.html @@ -21,7 +21,7 @@ <tr> <td>Fl_Surface_Device</td> - <td>FLTK.Devices.Surfaces</td> + <td>FLTK.Devices.Surface</td> </tr> </table> diff --git a/doc/index.html b/doc/index.html index 4e7357d..01b4bc7 100644 --- a/doc/index.html +++ b/doc/index.html @@ -139,11 +139,11 @@ <li><a href="fl_ask.html">FLTK.Asks</a></li> <li><a href="fl_device.html">FLTK.Devices</a></li> <li><a href="fl_graphics_driver.html">FLTK.Devices.Graphics</a></li> - <li><a href="fl_surface_device.html">FLTK.Devices.Surfaces</a></li> - <li><a href="fl_copy_surface.html">FLTK.Devices.Surfaces.Copy</a></li> - <li><a href="fl_image_surface.html">FLTK.Devices.Surfaces.Image</a></li> - <li><a href="fl_paged_device.html">FLTK.Devices.Surfaces.Paged</a></li> - <li><a href="fl_printer.html">FLTK.Devices.Surfaces.Paged.Printers</a></li> + <li><a href="fl_surface_device.html">FLTK.Devices.Surface</a></li> + <li><a href="fl_copy_surface.html">FLTK.Devices.Surface.Copy</a></li> + <li><a href="fl_image_surface.html">FLTK.Devices.Surface.Image</a></li> + <li><a href="fl_paged_device.html">FLTK.Devices.Surface.Paged</a></li> + <li><a href="fl_printer.html">FLTK.Devices.Surface.Paged.Printers</a></li> <li><a href="fl_draw.html">FLTK.Draw</a></li> <li><a href="fl_preferences.html">FLTK.Environment</a></li> <li><a href="fl.html">FLTK.Errors</a></li> diff --git a/src/fltk-devices-surfaces-copy.adb b/src/fltk-devices-surface-copy.adb index 8c90ffb..fe96f91 100644 --- a/src/fltk-devices-surfaces-copy.adb +++ b/src/fltk-devices-surface-copy.adb @@ -9,7 +9,7 @@ with Interfaces.C; -package body FLTK.Devices.Surfaces.Copy is +package body FLTK.Devices.Surface.Copy is function new_fl_copy_surface @@ -151,5 +151,6 @@ package body FLTK.Devices.Surfaces.Copy is end Set_Current; -end FLTK.Devices.Surfaces.Copy; +end FLTK.Devices.Surface.Copy; + diff --git a/src/fltk-devices-surfaces-copy.ads b/src/fltk-devices-surface-copy.ads index 0e0e59b..f5069c5 100644 --- a/src/fltk-devices-surfaces-copy.ads +++ b/src/fltk-devices-surface-copy.ads @@ -9,7 +9,7 @@ with FLTK.Widgets.Groups.Windows; -package FLTK.Devices.Surfaces.Copy is +package FLTK.Devices.Surface.Copy is type Copy_Surface is new Surface_Device with private; @@ -68,18 +68,15 @@ private (This : in out Copy_Surface); - - pragma Inline (Get_W); pragma Inline (Get_H); - pragma Inline (Draw_Widget); pragma Inline (Draw_Decorated_Window); - pragma Inline (Set_Current); -end FLTK.Devices.Surfaces.Copy; +end FLTK.Devices.Surface.Copy; + diff --git a/src/fltk-devices-surfaces-image.adb b/src/fltk-devices-surface-image.adb index 56566ea..d9a5e1b 100644 --- a/src/fltk-devices-surfaces-image.adb +++ b/src/fltk-devices-surface-image.adb @@ -9,7 +9,7 @@ with Interfaces.C; -package body FLTK.Devices.Surfaces.Image is +package body FLTK.Devices.Surface.Image is function new_fl_image_surface @@ -166,5 +166,6 @@ package body FLTK.Devices.Surfaces.Image is end Set_Current; -end FLTK.Devices.Surfaces.Image; +end FLTK.Devices.Surface.Image; + diff --git a/src/fltk-devices-surfaces-image.ads b/src/fltk-devices-surface-image.ads index f30133b..961a9b2 100644 --- a/src/fltk-devices-surfaces-image.ads +++ b/src/fltk-devices-surface-image.ads @@ -11,7 +11,7 @@ with FLTK.Widgets.Groups.Windows; -package FLTK.Devices.Surfaces.Image is +package FLTK.Devices.Surface.Image is type Image_Surface is new Surface_Device with private; @@ -80,21 +80,17 @@ private (This : in out Image_Surface); - - pragma Inline (Is_Highres); - pragma Inline (Draw_Widget); pragma Inline (Draw_Decorated_Window); - pragma Inline (Get_Image); pragma Inline (Get_Highres_Image); - pragma Inline (Set_Current); -end FLTK.Devices.Surfaces.Image; +end FLTK.Devices.Surface.Image; + diff --git a/src/fltk-devices-surfaces-paged-printers.adb b/src/fltk-devices-surface-paged-printers.adb index 601f425..f5c964a 100644 --- a/src/fltk-devices-surfaces-paged-printers.adb +++ b/src/fltk-devices-surface-paged-printers.adb @@ -13,7 +13,7 @@ use type Interfaces.C.int; -package body FLTK.Devices.Surfaces.Paged.Printers is +package body FLTK.Devices.Surface.Paged.Printers is function new_fl_printer @@ -353,5 +353,6 @@ package body FLTK.Devices.Surfaces.Paged.Printers is end Set_Current; -end FLTK.Devices.Surfaces.Paged.Printers; +end FLTK.Devices.Surface.Paged.Printers; + diff --git a/src/fltk-devices-surfaces-paged-printers.ads b/src/fltk-devices-surface-paged-printers.ads index e1c2ee7..ac5294d 100644 --- a/src/fltk-devices-surfaces-paged-printers.ads +++ b/src/fltk-devices-surface-paged-printers.ads @@ -9,10 +9,10 @@ with FLTK.Widgets.Groups.Windows; -package FLTK.Devices.Surfaces.Paged.Printers is +package FLTK.Devices.Surface.Paged.Printers is - type Printer is new Paged_Surface with private; + type Printer is new Paged_Device with private; type Printer_Reference (Data : not null access Printer'Class) is limited null record with Implicit_Dereference => Data; @@ -110,20 +110,17 @@ package FLTK.Devices.Surfaces.Paged.Printers is private - type Printer is new Paged_Surface with null record; + type Printer is new Paged_Device with null record; overriding procedure Finalize (This : in out Printer); - - pragma Inline (Start_Job); pragma Inline (End_Job); pragma Inline (Start_Page); pragma Inline (End_Page); - pragma Inline (Get_Margins); pragma Inline (Get_Printable_Rect); pragma Inline (Get_Origin); @@ -133,13 +130,12 @@ private pragma Inline (Translate); pragma Inline (Untranslate); - pragma Inline (Print_Widget); pragma Inline (Print_Window_Part); - pragma Inline (Set_Current); -end FLTK.Devices.Surfaces.Paged.Printers; +end FLTK.Devices.Surface.Paged.Printers; + diff --git a/src/fltk-devices-surfaces-paged.adb b/src/fltk-devices-surface-paged.adb index 5de3fec..75957c5 100644 --- a/src/fltk-devices-surfaces-paged.adb +++ b/src/fltk-devices-surface-paged.adb @@ -13,7 +13,7 @@ use type Interfaces.C.int; -package body FLTK.Devices.Surfaces.Paged is +package body FLTK.Devices.Surface.Paged is function new_fl_paged_device @@ -136,7 +136,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Finalize - (This : in out Paged_Surface) is + (This : in out Paged_Device) is begin if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_paged_device (This.Void_Ptr); @@ -150,9 +150,9 @@ package body FLTK.Devices.Surfaces.Paged is package body Forge is function Create - return Paged_Surface is + return Paged_Device is begin - return This : Paged_Surface do + return This : Paged_Device do This.Void_Ptr := new_fl_paged_device; end return; end Create; @@ -165,7 +165,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural) is begin if fl_paged_device_start_job @@ -177,7 +177,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural; From, To : in Positive) is begin @@ -193,14 +193,14 @@ package body FLTK.Devices.Surfaces.Paged is procedure End_Job - (This : in out Paged_Surface) is + (This : in out Paged_Device) is begin fl_paged_device_end_job (This.Void_Ptr); end End_Job; procedure Start_Page - (This : in out Paged_Surface) is + (This : in out Paged_Device) is begin if fl_paged_device_start_page (This.Void_Ptr) /= 0 then raise Page_Error; @@ -209,7 +209,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure End_Page - (This : in out Paged_Surface) is + (This : in out Paged_Device) is begin if fl_paged_device_end_page (This.Void_Ptr) /= 0 then raise Page_Error; @@ -220,7 +220,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Get_Margins - (This : in Paged_Surface; + (This : in Paged_Device; Left, Top, Right, Bottom : out Integer) is begin fl_paged_device_margins @@ -233,7 +233,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Get_Printable_Rect - (This : in Paged_Surface; + (This : in Paged_Device; W, H : out Integer) is begin if fl_paged_device_printable_rect @@ -245,7 +245,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Get_Origin - (This : in Paged_Surface; + (This : in Paged_Device; X, Y : out Integer) is begin fl_paged_device_get_origin (This.Void_Ptr, Interfaces.C.int (X), Interfaces.C.int (Y)); @@ -253,7 +253,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Set_Origin - (This : in out Paged_Surface; + (This : in out Paged_Device; X, Y : in Integer) is begin fl_paged_device_set_origin @@ -264,7 +264,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Rotate - (This : in out Paged_Surface; + (This : in out Paged_Device; Degrees : in Float) is begin fl_paged_device_rotate (This.Void_Ptr, Interfaces.C.C_float (Degrees)); @@ -272,7 +272,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor : in Float) is begin fl_paged_device_scale (This.Void_Ptr, Interfaces.C.C_float (Factor), 0.0); @@ -280,7 +280,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor_X, Factor_Y : in Float) is begin fl_paged_device_scale @@ -291,7 +291,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Translate - (This : in out Paged_Surface; + (This : in out Paged_Device; Delta_X, Delta_Y : in Integer) is begin fl_paged_device_translate @@ -302,7 +302,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Untranslate - (This : in out Paged_Surface) is + (This : in out Paged_Device) is begin fl_paged_device_untranslate (This.Void_Ptr); end Untranslate; @@ -311,7 +311,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Print_Widget - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Widget'Class; Offset_X, Offset_Y : in Integer := 0) is begin @@ -324,7 +324,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Print_Window - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; Offset_X, Offset_Y : in Integer := 0) is begin @@ -337,7 +337,7 @@ package body FLTK.Devices.Surfaces.Paged is procedure Print_Window_Part - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; X, Y, W, H : in Integer; Offset_X, Offset_Y : in Integer := 0) is @@ -354,5 +354,6 @@ package body FLTK.Devices.Surfaces.Paged is end Print_Window_Part; -end FLTK.Devices.Surfaces.Paged; +end FLTK.Devices.Surface.Paged; + diff --git a/src/fltk-devices-surfaces-paged.ads b/src/fltk-devices-surface-paged.ads index 6c8a33d..1a3c13c 100644 --- a/src/fltk-devices-surfaces-paged.ads +++ b/src/fltk-devices-surface-paged.ads @@ -9,12 +9,12 @@ with FLTK.Widgets.Groups.Windows; -package FLTK.Devices.Surfaces.Paged is +package FLTK.Devices.Surface.Paged is - type Paged_Surface is new Surface_Device with private; + type Paged_Device is new Surface_Device with private; - type Paged_Surface_Reference (Data : not null access Paged_Surface'Class) is + type Paged_Device_Reference (Data : not null access Paged_Device'Class) is limited null record with Implicit_Dereference => Data; type Page_Format is @@ -37,7 +37,7 @@ package FLTK.Devices.Surfaces.Paged is package Forge is function Create - return Paged_Surface; + return Paged_Device; end Forge; @@ -45,76 +45,76 @@ package FLTK.Devices.Surfaces.Paged is procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural); procedure Start_Job - (This : in out Paged_Surface; + (This : in out Paged_Device; Count : in Natural; From, To : in Positive); procedure End_Job - (This : in out Paged_Surface); + (This : in out Paged_Device); procedure Start_Page - (This : in out Paged_Surface); + (This : in out Paged_Device); procedure End_Page - (This : in out Paged_Surface); + (This : in out Paged_Device); procedure Get_Margins - (This : in Paged_Surface; + (This : in Paged_Device; Left, Top, Right, Bottom : out Integer); procedure Get_Printable_Rect - (This : in Paged_Surface; + (This : in Paged_Device; W, H : out Integer); procedure Get_Origin - (This : in Paged_Surface; + (This : in Paged_Device; X, Y : out Integer); procedure Set_Origin - (This : in out Paged_Surface; + (This : in out Paged_Device; X, Y : in Integer); procedure Rotate - (This : in out Paged_Surface; + (This : in out Paged_Device; Degrees : in Float); procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor : in Float); procedure Scale - (This : in out Paged_Surface; + (This : in out Paged_Device; Factor_X, Factor_Y : in Float); procedure Translate - (This : in out Paged_Surface; + (This : in out Paged_Device; Delta_X, Delta_Y : in Integer); procedure Untranslate - (This : in out Paged_Surface); + (This : in out Paged_Device); procedure Print_Widget - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Widget'Class; Offset_X, Offset_Y : in Integer := 0); procedure Print_Window - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; Offset_X, Offset_Y : in Integer := 0); procedure Print_Window_Part - (This : in out Paged_Surface; + (This : in out Paged_Device; Item : in FLTK.Widgets.Groups.Windows.Window'Class; X, Y, W, H : in Integer; Offset_X, Offset_Y : in Integer := 0); @@ -123,12 +123,10 @@ package FLTK.Devices.Surfaces.Paged is private - type Paged_Surface is new Surface_Device with null record; + type Paged_Device is new Surface_Device with null record; overriding procedure Finalize - (This : in out Paged_Surface); - - + (This : in out Paged_Device); pragma Inline (Start_Job); @@ -136,7 +134,6 @@ private pragma Inline (Start_Page); pragma Inline (End_Page); - pragma Inline (Get_Margins); pragma Inline (Get_Printable_Rect); pragma Inline (Get_Origin); @@ -146,11 +143,11 @@ private pragma Inline (Translate); pragma Inline (Untranslate); - pragma Inline (Print_Widget); pragma Inline (Print_Window); pragma Inline (Print_Window_Part); -end FLTK.Devices.Surfaces.Paged; +end FLTK.Devices.Surface.Paged; + diff --git a/src/fltk-devices-surfaces.adb b/src/fltk-devices-surface.adb index 58a5fa0..fc8e077 100644 --- a/src/fltk-devices-surfaces.adb +++ b/src/fltk-devices-surface.adb @@ -4,7 +4,7 @@ -- Released into the public domain -package body FLTK.Devices.Surfaces is +package body FLTK.Devices.Surface is function new_fl_surface @@ -88,5 +88,6 @@ begin Original_Surface.Needs_Dealloc := False; -end FLTK.Devices.Surfaces; +end FLTK.Devices.Surface; + diff --git a/src/fltk-devices-surfaces.ads b/src/fltk-devices-surface.ads index c92f93b..8ca367c 100644 --- a/src/fltk-devices-surfaces.ads +++ b/src/fltk-devices-surface.ads @@ -9,10 +9,10 @@ with FLTK.Devices.Graphics; -package FLTK.Devices.Surfaces is +package FLTK.Devices.Surface is - pragma Elaborate_Body (FLTK.Devices.Surfaces); + pragma Elaborate_Body (FLTK.Devices.Surface); @@ -52,17 +52,14 @@ private (This : in out Surface_Device); - - Original_Surface : aliased Surface_Device; Current_Ptr : access Surface_Device'Class := Original_Surface'Access; - - pragma Inline (Get_Current); pragma Inline (Set_Current); -end FLTK.Devices.Surfaces; +end FLTK.Devices.Surface; + |