Finally removes occurences of OnMenuCommand and closes bug #1164678

[wxWidgets.git] / src / stc / scintilla / include / Platform.h

diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index 1058242fb36c110776e1daf27ee46011f9ebdb26..1e3bd69d752e263134a739f8cda9eb722a11505c 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -44,11 +44,6 @@
 #endif
 
 
 #endif
 
 

-#if PLAT_WX
-#include <wx/object.h>  // For the global memory operators, if needed.
-#endif
-
-

 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 
 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 


@@ -69,7 +64,7 @@ public:
        int x;
        int y;
 
        int x;
        int y;
 

-       Point(int x_=0, int y_=0) : x(x_), y(y_) {
+       explicit Point(int x_=0, int y_=0) : x(x_), y(y_) {

        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine
        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine


@@ -284,7 +279,8 @@ public:
        Font();
        virtual ~Font();
 
        Font();
        virtual ~Font();
 

-       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag=false);
+       virtual void Create(const char *faceName, int characterSet, int size,
+               bool bold, bool italic, bool extraFontFlag=false);

        virtual void Release();
 
        FontID GetID() { return id; }
        virtual void Release();
 
        FontID GetID() { return id; }