diff options
| author | Manolo Gouy <Manolo> | 2016-04-19 15:33:58 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-19 15:33:58 +0000 |
| commit | 1e060f640870dd1d3157ac70844b8461c955ff97 (patch) | |
| tree | d65d68ad671353f03125cb46849b89064d492422 /src/drivers/WinAPI | |
| parent | 6600993adc787768217609c93dd0b3cab581864e (diff) | |
Transform Fl_X::make(Fl_Window*) for WIN32 platform into virtual Fl_X* Fl_Window_Driver::makeWindow().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11659 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/WinAPI')
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 3 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index 7a1edad76..2d45307e3 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -72,11 +72,14 @@ public: struct icon_data *icon_; HCURSOR cursor; int custom_cursor; + void set_minmax(LPMINMAXINFO minmax); + int fake_X_wm(int &X, int &Y, int &bt,int &bx,int &by); // --- window data virtual int decorated_w(); virtual int decorated_h(); // --- window management + virtual Fl_X *makeWindow(); virtual void flush_double(); virtual void flush_overlay(); virtual void draw_begin(); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index b72a6d7a4..fd8eac8e6 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -524,12 +524,12 @@ void Fl_WinAPI_Window_Driver::fullscreen_on() { void Fl_WinAPI_Window_Driver::fullscreen_off(int X, int Y, int W, int H) { pWindow->_clear_fullscreen(); DWORD style = GetWindowLong(fl_xid(pWindow), GWL_STYLE); - // Remove the xid temporarily so that Fl_X::fake_X_wm() behaves like it - // does in Fl_X::make(). + // Remove the xid temporarily so that Fl_WinAPI_Window_Driver::fake_X_wm() behaves like it + // does in Fl_WinAPI_Window_Driver::makeWindow(). HWND xid = fl_xid(pWindow); Fl_X::i(pWindow)->xid = NULL; int wx, wy, bt, bx, by; - switch (Fl_X::fake_X_wm(pWindow, wx, wy, bt, bx, by)) { + switch (fake_X_wm(wx, wy, bt, bx, by)) { case 0: break; case 1: |