1 files changed, 30 insertions, 15 deletions

diff --git a/src/c_fl_paged_device.cpp b/src/c_fl_paged_device.cpp
index 6c56c75..2f60c23 100644
--- a/src/c_fl_paged_device.cpp
+++ b/src/c_fl_paged_device.cpp
@@ -30,65 +30,79 @@ void free_fl_paged_device(PAGED_DEVICE p) {
 
 
 int fl_paged_device_start_job(PAGED_DEVICE p, int c) {
-    return reinterpret_cast<Fl_Paged_Device*>(p)->start_job(c,0,0);
+    //  virtual so disable dispatch
+    return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c,0,0);
 }
 
 int fl_paged_device_start_job2(PAGED_DEVICE p, int c, int f, int t) {
-    return reinterpret_cast<Fl_Paged_Device*>(p)->start_job(c,&f,&t);
+    //  virtual so disable dispatch
+    return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c,&f,&t);
 }
 
 void fl_paged_device_end_job(PAGED_DEVICE p) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->end_job();
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_job();
 }
 
 int fl_paged_device_start_page(PAGED_DEVICE p) {
-    return reinterpret_cast<Fl_Paged_Device*>(p)->start_page();
+    //  virtual so disable dispatch
+    return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_page();
 }
 
 int fl_paged_device_end_page(PAGED_DEVICE p) {
-    return reinterpret_cast<Fl_Paged_Device*>(p)->end_page();
+    //  virtual so disable dispatch
+    return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_page();
 }
 
 
 
 
 void fl_paged_device_margins(PAGED_DEVICE p, int * l, int * t, int * r, int * b) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->margins(l,t,r,b);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::margins(l,t,r,b);
 }
 
 int fl_paged_device_printable_rect(PAGED_DEVICE p, int * w, int * h) {
-    return reinterpret_cast<Fl_Paged_Device*>(p)->printable_rect(w,h);
+    //  virtual so disable dispatch
+    return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::printable_rect(w,h);
 }
 
 void fl_paged_device_get_origin(PAGED_DEVICE p, int * x, int * y) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->origin(x,y);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y);
 }
 
 void fl_paged_device_set_origin(PAGED_DEVICE p, int x, int y) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->origin(x,y);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y);
 }
 
 void fl_paged_device_rotate(PAGED_DEVICE p, float r) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->rotate(r);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::rotate(r);
 }
 
 void fl_paged_device_scale(PAGED_DEVICE p, float x, float y) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->scale(x,y);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::scale(x,y);
 }
 
 void fl_paged_device_translate(PAGED_DEVICE p, int x, int y) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->translate(x,y);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::translate(x,y);
 }
 
 void fl_paged_device_untranslate(PAGED_DEVICE p) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->untranslate();
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::untranslate();
 }
 
 
 
 
 void fl_paged_device_print_widget(PAGED_DEVICE p, void * i, int dx, int dy) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->print_widget(reinterpret_cast<Fl_Widget*>(i),dx,dy);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_widget(reinterpret_cast<Fl_Widget*>(i),dx,dy);
 }
 
 void fl_paged_device_print_window(PAGED_DEVICE p, void * i, int dx, int dy) {
@@ -96,7 +110,8 @@ void fl_paged_device_print_window(PAGED_DEVICE p, void * i, int dx, int dy) {
 }
 
 void fl_paged_device_print_window_part(PAGED_DEVICE p, void * i, int x, int y, int w, int h, int dx, int dy) {
-    reinterpret_cast<Fl_Paged_Device*>(p)->print_window_part(reinterpret_cast<Fl_Window*>(i),x,y,w,h,dx,dy);
+    //  virtual so disable dispatch
+    reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_window_part(reinterpret_cast<Fl_Window*>(i),x,y,w,h,dx,dy);
 }