commit 06eb8a3331fe66f93186248ec757d9e643e99b5c Author: mortenmacfly <mortenmacfly@2a5c6006-c6dd-42ca-98ab-0921f2732cef> Date: Tue Mar 31 15:44:13 2020 +0000 * keybinder: remove old-school #pragmas to fix bug #936 and https://bugzilla.redhat.com/show_bug.cgi?id=1819154 - keybinder: also, remove Borland c related pragmas. (Who will ever compile C::B using Borland C?) git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12012 2a5c6006-c6dd-42ca-98ab-0921f2732cef diff --git a/src/plugins/contrib/keybinder/cbKeyConfigPanel.h b/src/plugins/contrib/keybinder/cbKeyConfigPanel.h index 4cb22ab64..239372cac 100644 --- a/src/plugins/contrib/keybinder/cbKeyConfigPanel.h +++ b/src/plugins/contrib/keybinder/cbKeyConfigPanel.h @@ -10,10 +10,6 @@ #ifndef CBKEYCONFIGPANEL_H #define CBKEYCONFIGPANEL_H -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - // Modified Keybinder for CodeBlocks KeyBnder v2.0 // ---------------------------------------------------------------------------- diff --git a/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp b/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp index fab570bf2..ed0e5a264 100644 --- a/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp +++ b/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp @@ -12,10 +12,6 @@ // Modified CodeBlocks KeyBnder v2.0 2019/04/8 -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation "cbkeybinder.h" -#endif - #include <vector> #include <sdk.h> diff --git a/src/plugins/contrib/keybinder/cbkeybinder.cpp b/src/plugins/contrib/keybinder/cbkeybinder.cpp index 64409ee2c..611f0c656 100644 --- a/src/plugins/contrib/keybinder/cbkeybinder.cpp +++ b/src/plugins/contrib/keybinder/cbkeybinder.cpp @@ -12,10 +12,6 @@ // Modified CodeBlocks KeyBnder v2.0 2019/04/8 -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation "cbkeybinder.h" -#endif - #include <vector> #include <sdk.h> diff --git a/src/plugins/contrib/keybinder/cbkeybinder.h b/src/plugins/contrib/keybinder/cbkeybinder.h index 78ff884d1..c635b3d80 100644 --- a/src/plugins/contrib/keybinder/cbkeybinder.h +++ b/src/plugins/contrib/keybinder/cbkeybinder.h @@ -10,14 +10,6 @@ #ifndef CBKEYBINDER_H #define CBKEYBINDER_H -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "cbkeybinder.h" -#endif - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - #include <wx/string.h> //-#include <wx/timer.h> #include <wx/listbook.h> diff --git a/src/plugins/contrib/keybinder/keybinder.cpp b/src/plugins/contrib/keybinder/keybinder.cpp index d993ca9df..70a12a4a8 100644 --- a/src/plugins/contrib/keybinder/keybinder.cpp +++ b/src/plugins/contrib/keybinder/keybinder.cpp @@ -12,11 +12,6 @@ // Modified Keybinder for CodeBlocks KeyBnder v2.0 2019/04/8 -#ifdef __GNUG__ -#pragma implementation "keybinder.h" //necessary for linux, else undefines when linking -#endif - - // includes #include <wx/event.h> #include <wx/frame.h> // Manager::Get()->GetAppWindow() diff --git a/src/plugins/contrib/keybinder/keybinder.h b/src/plugins/contrib/keybinder/keybinder.h index bc7121867..257240abc 100644 --- a/src/plugins/contrib/keybinder/keybinder.h +++ b/src/plugins/contrib/keybinder/keybinder.h @@ -16,10 +16,6 @@ #ifndef __KEYBINDER_G__ #define __KEYBINDER_G__ -#ifdef __GNUG__ -#pragma interface "keybinder.h" -#endif - // required includes #include "wx/panel.h" #include "wx/dialog.h" diff --git a/src/plugins/contrib/keybinder/menuutils.cpp b/src/plugins/contrib/keybinder/menuutils.cpp index 47d4c5b85..e5693f088 100644 --- a/src/plugins/contrib/keybinder/menuutils.cpp +++ b/src/plugins/contrib/keybinder/menuutils.cpp @@ -10,17 +10,10 @@ // RCS-ID: $Id: menuutils.cpp 11980 2020-03-12 18:24:19Z fuscated $ // menuutils for KeyBinder v2.0 2019/04/8 -#ifdef __GNUG__ -#pragma implementation "menuutils.h" -#endif // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif diff --git a/src/plugins/contrib/keybinder/menuutils.h b/src/plugins/contrib/keybinder/menuutils.h index 8752e38dc..3ab616f4b 100644 --- a/src/plugins/contrib/keybinder/menuutils.h +++ b/src/plugins/contrib/keybinder/menuutils.h @@ -15,10 +15,6 @@ #ifndef __WX_MENUUTILS_H__ #define __WX_MENUUTILS_H__ -#ifdef __GNUG__ -#pragma interface "menuutils.h" -#endif - // includes #include "wx/panel.h" #include "wx/dialog.h"