From 1298bf00f577292a46c4ff22ff46a0e2ee3ba30d Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:54:38 +0100 Subject: Remove FL_CFG_WIN_COCOA preprocessor variable from Fl_Sys_Menu_Bar.cxx --- src/Fl_Sys_Menu_Bar.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/Fl_Sys_Menu_Bar.cxx') diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 662cb0f19..267805cd4 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -1,7 +1,7 @@ // // system menu bar widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2021 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -15,9 +15,10 @@ // -#include "config_lib.h" +#include #include "Fl_Sys_Menu_Bar_Driver.H" #include +#include "Fl_System_Driver.H" Fl_Sys_Menu_Bar *fl_sys_menu_bar = 0; @@ -238,11 +239,9 @@ void Fl_Sys_Menu_Bar::create_window_menu() { } #if !defined(FL_DOXYGEN) -#if ! defined(FL_CFG_WIN_COCOA) Fl_Sys_Menu_Bar_Driver *Fl_Sys_Menu_Bar::driver() { - return NULL; + return Fl::system_driver()->sys_menu_bar_driver(); } -#endif // !FL_CFG_WIN_COCOA Fl_Sys_Menu_Bar_Driver *Fl_Sys_Menu_Bar_Driver::driver_ = 0; -- cgit v1.2.3