From b75d7526fde03a9a831fd21afa38efeaa5d55a24 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Thu, 1 Sep 2022 11:55:41 +0200 Subject: Simplify Fl_Window_Driver::screen_num() member functions. --- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 3 --- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 11 ----------- 2 files changed, 14 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index 2e6946471..afc8cc39b 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -58,7 +58,6 @@ class Fl_WinAPI_Window_Driver : public Fl_Window_Driver Fl_Image* shape_; ///< shape image Fl_Bitmap *effective_bitmap_; ///< auxiliary bitmap image } *shape_data_; - int screen_num_; private: void shape_bitmap_(Fl_Image* b); void shape_alpha_(Fl_Image* img, int offset); @@ -68,8 +67,6 @@ public: static inline Fl_WinAPI_Window_Driver* driver(const Fl_Window *w) {return (Fl_WinAPI_Window_Driver*)Fl_Window_Driver::driver(w);} HDC private_dc; // used for OpenGL RECT border_width_title_bar_height(int &bx, int &by, int &bt); - virtual void screen_num(int n); - virtual int screen_num(); struct icon_data *icon_; HCURSOR cursor; diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 5f8c40d8d..45e5cb39e 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -55,20 +55,9 @@ Fl_WinAPI_Window_Driver::~Fl_WinAPI_Window_Driver() delete icon_; } -int Fl_WinAPI_Window_Driver::screen_num() { - if (pWindow->parent()) { - screen_num_ = Fl_Window_Driver::driver(pWindow->top_window())->screen_num(); - } - return screen_num_ >= 0 ? screen_num_ : 0; -} //FILE*LOG=fopen("log.log","w"); -void Fl_WinAPI_Window_Driver::screen_num(int n) { -//fprintf(LOG, "screen_num setter old=%d new=%d\n",screen_num_, n);fflush(LOG); - screen_num_ = n; -} - RECT // frame of the decorated window in screen coordinates Fl_WinAPI_Window_Driver::border_width_title_bar_height( -- cgit v1.2.3