Skip to content

Commit

Permalink
[WIP] Remove almost all remaining references to wxWidgets/GD4 IDE rel…
Browse files Browse the repository at this point in the history
…ated code from codebase
  • Loading branch information
4ian committed Apr 23, 2019
1 parent d444ed7 commit b9680e2
Show file tree
Hide file tree
Showing 41 changed files with 23 additions and 3,099 deletions.
4 changes: 0 additions & 4 deletions .clang_complete
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
-DGD_IDE_ONLY
-DMACOS
-DRELEASE
-DWXUSINGDLL
-D_FILE_OFFSET_BITS=64
-D__WXMAC__
-D__WXOSX_COCOA__
-D__WXOSX__
-DwxDEBUG_LEVEL=0
-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
-Wno-potentially-evaluated-expression
Expand Down
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
/docs/GDJS Documentation
/docs/GDCpp Documentation
/docs/GDCore Documentation
/ExtLibs/wxwidgets
/ExtLibs/wxWidgets
/ExtLibs/SFML
/ExtLibs/*.7z
/scripts/Repository keys
Expand All @@ -20,13 +18,6 @@
/Binaries/Releases/**/*.tar.lzma
/Binaries/Releases/**/*.zip
/Binaries/Releases/**/*.deb
Binaries/Packaging/debian-source-package/gdevelop/
Binaries/Packaging/opensuse-build-service/gdevelop/
Binaries/Packaging/opensuse-build-service/final/
Binaries/Packaging/GDevelop.app
Binaries/Packaging/GDevelop.zip
Binaries/Packaging/GDevelop.pkg
Binaries/Packaging/logs
/GDevelop.js
*.depend
*.layout
Expand Down
20 changes: 3 additions & 17 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,13 @@
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
"/usr/include",
"/usr/local/lib/wx/include/osx_cocoa-unicode-3.0",
"/usr/local/include/wx-3.0",
"${workspaceRoot}"
],
"defines": [
"GD_IDE_ONLY",
"__WXMAC__",
"__WXOSX__",
"__WXOSX_COCOA__",
"GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
"GD_API=/* Macro used to export classes on Windows, please ignore */",
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
"WXUSINGDLL"
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
],
"intelliSenseMode": "clang-x64",
"browse": {
Expand Down Expand Up @@ -66,13 +60,9 @@
],
"defines": [
"GD_IDE_ONLY",
"__WXMAC__",
"__WXOSX__",
"__WXOSX_COCOA__",
"GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
"GD_API=/* Macro used to export classes on Windows, please ignore */",
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
"WXUSINGDLL"
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
],
"intelliSenseMode": "clang-x64",
"browse": {
Expand Down Expand Up @@ -102,13 +92,9 @@
"_DEBUG",
"UNICODE",
"GD_IDE_ONLY",
"__WXMAC__",
"__WXOSX__",
"__WXOSX_COCOA__",
"GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
"GD_API=/* Macro used to export classes on Windows, please ignore */",
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
"WXUSINGDLL"
"GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
],
"intelliSenseMode": "msvc-x64",
"browse": {
Expand Down
29 changes: 0 additions & 29 deletions Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,23 @@ set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SY
#Dependencies on external libraries:
###
include_directories(${sfml_include_dir})
IF(WIN32) #Special case for wxWidgets on Windows
include_directories(${wxwidgets_include_dir})
ELSEIF (NOT EMSCRIPTEN AND NOT NO_GUI)
find_package(wxWidgets COMPONENTS core base adv net ribbon stc aui propgrid richtext html xrc REQUIRED)
include( "${wxWidgets_USE_FILE}" )
include_directories(${GTK_INCLUDE_DIRS})
link_directories(${GTK_LIBRARY_DIRS})
ENDIF(WIN32)

#Defines
###
add_definitions( -DGD_IDE_ONLY )
IF (EMSCRIPTEN)
add_definitions( -DEMSCRIPTEN )
ENDIF()
IF (NO_GUI)
add_definitions( -DGD_NO_WX_GUI )
ENDIF()
IF(CMAKE_BUILD_TYPE MATCHES "Debug")
add_definitions( -DDEBUG )
IF(WIN32)
add_definitions( -D__WXDEBUG__ )
ENDIF(WIN32)
ELSE()
add_definitions( -DRELEASE )
ENDIF()

IF(WIN32)
add_definitions( -DWINDOWS )
add_definitions( "-DGD_CORE_API=__declspec(dllexport)" )

add_definitions( -D__GNUWIN32__ )
add_definitions( -D__WXMSW__ )
add_definitions( -DwxUSE_UNICODE=1 )
add_definitions( -DWXUSINGDLL )
ELSE()
IF(APPLE)
add_definitions( -DMACOS )
Expand All @@ -58,20 +40,13 @@ ELSE()
ENDIF()
add_definitions( -DGD_API= )
add_definitions( -DGD_CORE_API= )
IF (NOT NO_GUI)
add_definitions(${GTK_CFLAGS_OTHER})
ENDIF()
ENDIF(WIN32)

#The target
###
include_directories(.)
file(GLOB_RECURSE source_files GDCore/*)

IF(NO_GUI)
list(REMOVE_ITEM source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
ENDIF()

file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensions/* GDCore/IDE/* GDCore/Project/* GDCore/Serialization/* GDCore/Tools/*)
list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
gd_add_clang_utils(GDCore "${formatted_source_files}")
Expand All @@ -95,8 +70,6 @@ IF(EMSCRIPTEN)
#Nothing.
ELSE()
target_link_libraries(GDCore ${sfml_LIBRARIES})
target_link_libraries(GDCore ${wxWidgets_LIBRARIES})
target_link_libraries(GDCore ${GTK_LIBRARIES})
ENDIF()

#Tests
Expand All @@ -112,6 +85,4 @@ if(BUILD_TESTS)
set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) #Allow finding dependencies directly from build path on Mac OS X.
target_link_libraries(GDCore_tests GDCore)
target_link_libraries(GDCore_tests ${sfml_LIBRARIES})
target_link_libraries(GDCore_tests ${wxWidgets_LIBRARIES})
target_link_libraries(GDCore_tests ${GTK_LIBRARIES})
endif()
2 changes: 0 additions & 2 deletions Core/GDCore/CommonTools.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#define GD_DEPRECATED
#endif

class wxString;

namespace gd
{

Expand Down
57 changes: 0 additions & 57 deletions Core/GDCore/DocMainPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
* The installation is fairly simple :<br>
* <br>
* - Launch the installer.<br>
* - Uncheck "Check for updated files on the TDM-GCC server" (otherwise you won't get TDM-GCC 4.9.2 but a more recent version that won't be compatible with wxWidgets pre-compiled binaries)
* - Choose Create.<br>
\image html compilerInstall1.png
Expand Down Expand Up @@ -157,9 +156,6 @@
* Binaries are created into *Binaries/Output/Release_{OS}* folder.
*
* To launch GDevelop in Windows, double click on **GDIDE**. For Linux, launch **StartGDevelop.sh**.
*
* If the build failed, check that you've properly installed wxWidgets and that you have installed any required
* development library.
*/

/**
Expand Down Expand Up @@ -192,18 +188,6 @@ sudo apt-get install curl
sudo apt-get install devscripts
\endcode
*
* \subsection wxWidgets Install wxWidgets development libraries
*
* Most distributions have wxWidgets 3 development libraries available: install them using your package manager. On Ubuntu:
\code
sudo apt-get install libwxgtk3.0-dev
\endcode
You should also have GTK+ development libraries installed. For GTK+2:
\code
sudo apt-get install libgtk2.0-dev
\endcode
*
* \subsection installcmake Install CMake
* You'll need CMake to build GDevelop: See more on \subpage installAndUseCMake.
Expand All @@ -222,7 +206,6 @@ sudo apt-get install libgtk2.0-dev
brew install cmake
brew install p7zip
brew install pkgconfig
brew install wxwidgets
brew install freetype
\endcode
* If you want to generate the documentation and translations, install Doxygen and Gettext:
Expand All @@ -248,44 +231,6 @@ make -j4
/**
* \page recommendedToolsAndConventions Recommended tools and advices to work with GD
*
* \section texteditor Text editor
*
* GDevelop is compiled thanks to CMake which can generate *Makefiles* or a project file for most popular IDE available.<br>
*
* [Sublime Text](http://www.sublimetext.com/) is a very nice text editor for programmers:
* *"You'll love the slick user interface, extraordinary features and amazing performance."*. <br>
* It has nice features like shortcut to search for a file at an amazing speed (just type a few letters of the file name you're searching for),
* multiple selection, plugins for better C++ and Javascript support.
*
* Take a look at it if you're unsure about which IDE to use. If you're more familiar with another IDE,
* ask CMake to generate a project file for it.
*
* ------
*
* \section designers Visual designers for IDE or GDCore dialogs
*
* \subsection newDesigner "New" dialogs created with wxCrafter
*
* New dialogs are designed using [wxCrafter](http://wxcrafter.codelite.org/). Download and launch it.
*
* All dialogs of GDCore, GDCpp, GDJS or the IDE created using wxCrafter are stored into a single .wxcp file in
* the wxsmith folder, next to files of dialogs created with wxSmith.<br>
* For example, open *GDJS/wxsmith/GDJS.wxcp*.
*
* You can edit and add new dialogs. Do not forget to click on "Generate code" if you made any change.
*
* wxCrafter creates base classes for dialog (their names start by *Base*), and any code must be inserted into
* a derived class. See examples in *GDJS*.
*
* \subsection oldDesigner "Old" dialogs created with wxSmith
* If you want to edit a dialog, first search if there is a file called *filename*.wxs in the folder *wxsmith* (in GDCore,
* GDCpp or IDE). If it is present, the dialog was made using the wxSmith visual designer integrated into the Code::Blocks IDE:
* - Download [Code::Blocks](http://www.codeblocks.org/) and launch it.
* - Open the .cbp in GDCore, GDCpp or IDE folder.
* - In the tab "Resources", locate the dialog to edit.
*
* ------
*
* \section git Git and GitHub
*
* Git is an amazing *version control system*. If you never used it before, take a look at some tutorials, there
Expand Down Expand Up @@ -413,8 +358,6 @@ double twopointfive = twopointfive.To<double>();
//twopointfive == 2.5
\endcode
*
* gd::String can also be implicitly constructed from a wxString or a sf::String, so that it is easy to use when you're dealing
* with wxWidgets GUI dialogs/editors or SFML objects.
*
* For more information, see the complete reference of the class. Tests cases have also been made for most functions.
*/
Expand Down
2 changes: 0 additions & 2 deletions Core/GDCore/Events/Event.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class Platform;
class SerializerElement;
class Instruction;
}
class wxWindow;
class wxDC;

namespace gd {

Expand Down
3 changes: 1 addition & 2 deletions Core/GDCore/IDE/Events/InstructionSentenceFormatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ class GD_CORE_API InstructionSentenceFormatter {
gd::String LabelFromType(const gd::String &type);

/**
* \brief Load the configuration from the default configuration,
* or saved configuration if one was saved with wxWidgets.
* \brief Load the configuration from the default configuration.
*/
void LoadTypesFormattingFromConfig();

Expand Down
Loading

0 comments on commit b9680e2

Please sign in to comment.