Commit dbd09116 authored by twanvl's avatar twanvl

Compiles again under MSW after porting changes for linux

parent 3420e335
...@@ -79,7 +79,7 @@ void CardListColumnSelectDialog::initList() { ...@@ -79,7 +79,7 @@ void CardListColumnSelectDialog::initList() {
// check // check
int i = list->GetCount() - 1; int i = list->GetCount() - 1;
list->Check(i, c.settings.visible); list->Check(i, c.settings.visible);
#ifdef _WX_MSW_ #ifdef __WXMSW__
// fix the background color // fix the background color
list->GetItem(i)->SetBackgroundColour(window_color); list->GetItem(i)->SetBackgroundColour(window_color);
#endif #endif
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
class ValueEditor { class ValueEditor {
public: public:
virtual ~ValueEditor(); virtual ~ValueEditor() {}
// --------------------------------------------------- : Events // --------------------------------------------------- : Events
/// This editor gains focus /// This editor gains focus
......
...@@ -1178,7 +1178,7 @@ ...@@ -1178,7 +1178,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File <File
RelativePath=".\resource\mse.rc"> RelativePath=".\resource\msw\mse.rc">
</File> </File>
</Filter> </Filter>
<Filter <Filter
...@@ -1627,6 +1627,9 @@ ...@@ -1627,6 +1627,9 @@
<Filter <Filter
Name="util" Name="util"
Filter=""> Filter="">
<File
RelativePath=".\util\atomic.hpp">
</File>
<File <File
RelativePath=".\util\dynamic_arg.hpp"> RelativePath=".\util\dynamic_arg.hpp">
</File> </File>
......
...@@ -37,11 +37,6 @@ enum ScriptType ...@@ -37,11 +37,6 @@ enum ScriptType
/// Actual values are derived types /// Actual values are derived types
class ScriptValue : public IntrusivePtrBase { class ScriptValue : public IntrusivePtrBase {
public: public:
inline ScriptValue()
#ifdef USE_INTRUSIVE_PTR
: refCount(0)
#endif
{}
virtual ~ScriptValue() {} virtual ~ScriptValue() {}
/// Information on the type of this value /// Information on the type of this value
......
...@@ -52,7 +52,7 @@ class PackageError : public Error { ...@@ -52,7 +52,7 @@ class PackageError : public Error {
class FileNotFoundError : public PackageError { class FileNotFoundError : public PackageError {
public: public:
inline FileNotFoundError(const String& file, const String& package) inline FileNotFoundError(const String& file, const String& package)
: PackageError(_ERROR_2_("file not found", file.c_str(), package.c_str())) : PackageError(_ERROR_2_("file not found", file, package))
{} {}
}; };
...@@ -68,7 +68,7 @@ class ParseError : public Error { ...@@ -68,7 +68,7 @@ class ParseError : public Error {
class FileParseError : public ParseError { class FileParseError : public ParseError {
public: public:
inline FileParseError(const String& err, const String& file) : inline FileParseError(const String& err, const String& file) :
ParseError(_ERROR_2_("file parse error", file.c_str(), err.c_str())) ParseError(_ERROR_2_("file parse error", file, err))
{} {}
}; };
......
...@@ -10,11 +10,10 @@ ...@@ -10,11 +10,10 @@
// ----------------------------------------------------------------------------- : Includes // ----------------------------------------------------------------------------- : Includes
#include <util/prec.hpp> #include <util/prec.hpp>
#include <script/value.hpp>
DECLARE_INTRUSIVE_POINTER_TYPE(ScriptValue); DECLARE_INTRUSIVE_POINTER_TYPE(ScriptValue);
DECLARE_INTRUSIVE_POINTER_TYPE(Script); DECLARE_INTRUSIVE_POINTER_TYPE(Script);
inline void intrusive_ptr_add_ref(ScriptValue* p);
inline void intrusive_ptr_release(ScriptValue* p);
template <typename T> class Defaultable; template <typename T> class Defaultable;
template <typename T> class Scriptable; template <typename T> class Scriptable;
......
...@@ -79,10 +79,10 @@ inline String format_string(const String& format, ...) { ...@@ -79,10 +79,10 @@ inline String format_string(const String& format, ...) {
va_end(args); va_end(args);
} }
inline String format_string(const String& format, const String& a0) { inline String format_string(const String& format, const String& a0) {
return format_string(format, a0.c_str()); return String::Format(format, a0.c_str());
} }
inline String format_string(const String& format, const String& a0, const String& a1) { inline String format_string(const String& format, const String& a0, const String& a1) {
return format_string(format, a0.c_str(), a1.c_str()); return String::Format(format, a0.c_str(), a1.c_str());
} }
// ----------------------------------------------------------------------------- : EOF // ----------------------------------------------------------------------------- : EOF
......
...@@ -105,14 +105,15 @@ inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const ...@@ -105,14 +105,15 @@ inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const
/// Base class for objects wishing to use intrusive_ptrs /// Base class for objects wishing to use intrusive_ptrs
class IntrusivePtrBase { class IntrusivePtrBase {
public: public:
virtual ~IntrusivePtrBase(); inline IntrusivePtrBase() : ref_count(0) {}
virtual ~IntrusivePtrBase() {}
protected: protected:
/// Delete this object /// Delete this object
virtual void destroy() { virtual void destroy() {
delete this; delete this;
} }
private: private:
volatile AtomicInt ref_count; AtomicInt ref_count;
friend void intrusive_ptr_add_ref(IntrusivePtrBase*); friend void intrusive_ptr_add_ref(IntrusivePtrBase*);
friend void intrusive_ptr_release(IntrusivePtrBase*); friend void intrusive_ptr_release(IntrusivePtrBase*);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment