diff options
| author | Manolo Gouy <Manolo> | 2018-06-26 07:38:54 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-06-26 07:38:54 +0000 |
| commit | 82c7a1baa77c7a618098ada84841494a8b3d24ad (patch) | |
| tree | 796c33583242784dd3559d291374a064b6e65cec | |
| parent | ca4601031cd7540b1a0e8108cb2939b40d8ad57d (diff) | |
Move Fl_Sys_Menu_Bar_Driver.H from FL/ to src/
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12972 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_MacOS_Sys_Menu_Bar.mm | 3 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar_Driver.H (renamed from FL/Fl_Sys_Menu_Bar_Driver.H) | 0 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index a73caa3b1..8b2987d58 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -18,7 +18,6 @@ #if defined(__APPLE__) -#include <FL/Fl_Sys_Menu_Bar_Driver.H> #include <FL/platform.H> #include "drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H" #include "flstring.h" @@ -26,7 +25,7 @@ #include <ctype.h> #include <stdarg.h> -#import <Cocoa/Cocoa.h> // keep this after include of Fl_Sys_Menu_Bar_Driver.H because of check() conflict +#import <Cocoa/Cocoa.h> // keep this after include of Fl_MacOS_Sys_Menu_Bar_Driver.H because of check() conflict typedef const Fl_Menu_Item *pFl_Menu_Item; diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 5c9800908..c93f26b2e 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -17,7 +17,7 @@ // -#include <FL/Fl_Sys_Menu_Bar_Driver.H> +#include "Fl_Sys_Menu_Bar_Driver.H" #include <FL/platform.H> diff --git a/FL/Fl_Sys_Menu_Bar_Driver.H b/src/Fl_Sys_Menu_Bar_Driver.H index 7d869ae64..7d869ae64 100644 --- a/FL/Fl_Sys_Menu_Bar_Driver.H +++ b/src/Fl_Sys_Menu_Bar_Driver.H diff --git a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H index d3c06a3da..7502947d2 100644 --- a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H +++ b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H @@ -19,7 +19,7 @@ #ifndef Fl_MacOS_Sys_Menu_Bar_Driver_H #define Fl_MacOS_Sys_Menu_Bar_Driver_H -#include <FL/Fl_Sys_Menu_Bar_Driver.H> +#include "../../Fl_Sys_Menu_Bar_Driver.H" class Fl_MacOS_Sys_Menu_Bar_Driver : public Fl_Sys_Menu_Bar_Driver { public: |