From c88466928db4ecdeb4e6c6eb84c873319d02ec7d Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 28 Jul 2017 15:51:05 +0000
Subject: Replace static protected bool Fl_Window_Driver::is_a_rescale by a
 private static variable and a public getter.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12364 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Double_Window.cxx | 2 +-
 src/Fl_Gl_Window.cxx     | 2 +-
 src/Fl_Group.cxx         | 2 +-
 src/Fl_Window_Driver.cxx | 6 +++---
 src/Fl_win32.cxx         | 4 ++--
 src/Fl_x.cxx             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 85e58c349..dfce3ea9b 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -55,7 +55,7 @@ void Fl_Double_Window::resize(int X,int Y,int W,int H) {
   int oh = h();
   Fl_Window::resize(X,Y,W,H);
   Fl_X *myi = Fl_X::i(this);
-  if (myi && driver()->other_xid && (ow < w() || oh < h() || Fl_Window_Driver::is_a_rescale))
+  if (myi && driver()->other_xid && (ow < w() || oh < h() || Fl_Window_Driver::is_a_rescale()))
     driver()->destroy_double_buffer();
 }
 
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index 1d1bc1724..426fd582e 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -261,7 +261,7 @@ void Fl_Gl_Window::resize(int X,int Y,int W,int H) {
 //  printf("Fl_Gl_Window::resize(X=%d, Y=%d, W=%d, H=%d)\n", X, Y, W, H);
 //  printf("current: x()=%d, y()=%d, w()=%d, h()=%d\n", x(), y(), w(), h());
 
-  int is_a_resize = (W != Fl_Widget::w() || H != Fl_Widget::h() || Fl_Window_Driver::is_a_rescale);
+  int is_a_resize = (W != Fl_Widget::w() || H != Fl_Widget::h() || Fl_Window_Driver::is_a_rescale());
   if (is_a_resize) valid(0);
   pGlWindowDriver->resize(is_a_resize, W, H);
   Fl_Window::resize(X,Y,W,H);
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 992f1c61f..a0ca7b7fd 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -700,7 +700,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) {
 
   Fl_Widget::resize(X,Y,W,H); // make new xywh values visible for children
 
-  if ((!resizable() || (dw==0 && dh==0 )) && !Fl_Window_Driver::is_a_rescale) {
+  if ((!resizable() || (dw==0 && dh==0 )) && !Fl_Window_Driver::is_a_rescale()) {
 
     if (!as_window()) {
       Fl_Widget*const* a = array();
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index 288ac8257..b16435dcf 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -257,7 +257,7 @@ int Fl_Window_Driver::screen_num() {
   return Fl::screen_num(x(), y(), w(), h());
 }
 
-bool Fl_Window_Driver::is_a_rescale = false;
+bool Fl_Window_Driver::is_a_rescale_ = false;
 
 void Fl_Window_Driver::resize_after_scale_change(int ns, float old_f, float new_f) {
   screen_num(ns);
@@ -268,10 +268,10 @@ void Fl_Window_Driver::resize_after_scale_change(int ns, float old_f, float new_
   } else {
     W = pWindow->w(); H = pWindow->h();
   }
-  is_a_rescale = true;
+  is_a_rescale_ = true;
   size_range();
   pWindow->resize(pWindow->x()*old_f/new_f,  pWindow->y()*old_f/new_f, W, H);
-  is_a_rescale = false;
+  is_a_rescale_ = false;
 }
 
 //
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index f5e064a62..cc58336b1 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1682,10 +1682,10 @@ int Fl_WinAPI_Window_Driver::fake_X_wm(int &X,int &Y, int &bt,int &bx, int &by)
 void Fl_WinAPI_Window_Driver::resize(int X,int Y,int W,int H) {
   UINT flags = SWP_NOSENDCHANGING | SWP_NOZORDER
              | SWP_NOACTIVATE | SWP_NOOWNERZORDER;
-  int is_a_resize = (W != w() || H != h() || is_a_rescale);
+  int is_a_resize = (W != w() || H != h() || is_a_rescale());
   int resize_from_program = (pWindow != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
-  if (X != x() || Y != y() || is_a_rescale) {
+  if (X != x() || Y != y() || is_a_rescale()) {
     force_position(1);
   } else {
     if (!is_a_resize) return;
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 887a09f39..25ae92d55 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2106,8 +2106,8 @@ fprintf(stderr,"\n");*/
 ////////////////////////////////////////////////////////////////
 
 void Fl_X11_Window_Driver::resize(int X,int Y,int W,int H) {
-  int is_a_move = (X != x() || Y != y() || is_a_rescale);
-  int is_a_resize = (W != w() || H != h() || is_a_rescale);
+  int is_a_move = (X != x() || Y != y() || is_a_rescale());
+  int is_a_resize = (W != w() || H != h() || is_a_rescale());
   int resize_from_program = (pWindow != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
   if (is_a_move && resize_from_program) force_position(1);
-- 
cgit v1.2.3