scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing GCC warnings.

Browse source
This commit is contained in:
Branimir Karadžić 2015-06-09 23:56:30 -07:00
parent 6e6e16e2ba
commit f0b76697c5
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/common/imgui/scintilla.cpp
View file

@ -8,6 +8,7 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <vector> #include <vector>
#include <string.h>
#include "scintilla/include/Platform.h" #include "scintilla/include/Platform.h"
#include "scintilla/include/Scintilla.h" #include "scintilla/include/Scintilla.h"
@ -351,16 +352,16 @@ inline WindowInt* GetWindow(Scintilla::WindowID id)
class ListBoxInt : public Scintilla::ListBox class ListBoxInt : public Scintilla::ListBox
{ {
public: public:
ListBoxInt::ListBoxInt() ListBoxInt()
: m_lineHeight(10) : m_maxStrWidth(0)
, m_unicodeMode(false) , m_lineHeight(10)
, m_desiredVisibleRows(5) , m_desiredVisibleRows(5)
, m_aveCharWidth(8) , m_aveCharWidth(8)
, m_maxStrWidth(0) , m_unicodeMode(false)
{ {
} }
ListBoxInt::~ListBoxInt() ~ListBoxInt()
{ {
} }
@ -468,16 +469,14 @@ private:
bool m_unicodeMode; bool m_unicodeMode;
}; };
struct ScEditor : public Scintilla::ScintillaBase struct Editor : public Scintilla::ScintillaBase
{ {
public: public:
ScEditor() Editor()
: m_width(0) : m_width(0)
, m_height(0) , m_height(0)
, m_wheelVRotation(0) , m_wheelVRotation(0)
, m_wheelHRotation(0) , m_wheelHRotation(0)
, m_foreground(0xffffffff)
, m_lineNumber(0xff00ffff)
, m_searchResultIndication(0xff5A5A5A) , m_searchResultIndication(0xff5A5A5A)
, m_filteredSearchResultIndication(0xff5a5a5a) , m_filteredSearchResultIndication(0xff5a5a5a)
, m_occurrenceIndication(0xff5a5a5a) , m_occurrenceIndication(0xff5a5a5a)
@ -508,10 +507,12 @@ public:
, m_staticField(0xff4b9ce9) , m_staticField(0xff4b9ce9)
, m_staticFinalField(0xff4b9ce9) , m_staticFinalField(0xff4b9ce9)
, m_deprecatedMember(0xfff9f9f9) , m_deprecatedMember(0xfff9f9f9)
, m_foreground(0xffffffff)
, m_lineNumber(0xff00ffff)
{ {
} }
virtual ~ScEditor() virtual ~Editor()
{ {
} }
@ -833,7 +834,7 @@ private:
ScintillaEditor* ScintillaEditor::create(int _width, int _height) ScintillaEditor* ScintillaEditor::create(int _width, int _height)
{ {
ScEditor* editor = IMGUI_NEW(ScEditor); Editor* editor = IMGUI_NEW(Editor);
editor->Initialise(); editor->Initialise();
editor->Resize(0, 0, _width, _height); editor->Resize(0, 0, _width, _height);
@ -843,18 +844,18 @@ ScintillaEditor* ScintillaEditor::create(int _width, int _height)
void ScintillaEditor::destroy(ScintillaEditor* _scintilla) void ScintillaEditor::destroy(ScintillaEditor* _scintilla)
{ {
IMGUI_DELETE(ScEditor, _scintilla); IMGUI_DELETE(Editor, _scintilla);
} }
intptr_t ScintillaEditor::command(unsigned int _msg, uintptr_t _p0, intptr_t _p1) intptr_t ScintillaEditor::command(unsigned int _msg, uintptr_t _p0, intptr_t _p1)
{ {
ScEditor* editor = reinterpret_cast<ScEditor*>(this); Editor* editor = reinterpret_cast<Editor*>(this);
return editor->command(_msg, _p0, _p1); return editor->command(_msg, _p0, _p1);
} }
void ScintillaEditor::draw() void ScintillaEditor::draw()
{ {
ScEditor* editor = reinterpret_cast<ScEditor*>(this); Editor* editor = reinterpret_cast<Editor*>(this);
return editor->draw(); return editor->draw();
} }
@ -1019,9 +1020,9 @@ namespace Scintilla
GetWindow(wid)->position = rc; GetWindow(wid)->position = rc;
} }
void Window::SetPositionRelative(PRectangle rc, Window w) void Window::SetPositionRelative(PRectangle _rc, Window /*_w*/)
{ {
SetPosition(rc); SetPosition(_rc);
} }
PRectangle Window::GetClientPosition() PRectangle Window::GetClientPosition()

4
scripts/example-common.lua
View file

@ -28,6 +28,10 @@ project ("example-common")
"SCI_LEXER", "SCI_LEXER",
} }
buildoptions {
-- "-Wno-missing-field-initializers",
}
includedirs { includedirs {
path.join(BGFX_DIR, "3rdparty/scintilla/include"), path.join(BGFX_DIR, "3rdparty/scintilla/include"),
path.join(BGFX_DIR, "3rdparty/scintilla/lexlib"), path.join(BGFX_DIR, "3rdparty/scintilla/lexlib"),