Cosmetic changes

diff --git a/Build b/Build
index 75f78840fc111611ec3b4d5e2df7ffaf909a12f8..9580ba607984f90dec3893321ce70db3b066e050 100644 (file)
--- a/Build
+++ b/Build
@@ -5,12 +5,9 @@ package "mspgui"
 
        require "mspcore";
        require "sigc++-2.0";
-       if_arch "!windows"
+       if_arch "!windows & !darwin"
        {
-               if_arch "!darwin"
-               {
-                       require "xlib";
-               };
+               require "xlib";
        };
        if_arch "windows"
        {
@@ -150,10 +147,7 @@ package "mspgui"
        program "ev"
        {
                source "examples/ev.cpp";
-               build_info
-               {
-                       library "mspgui";
-               };
+               use "mspgui";
        };
 
        source_tarball

diff --git a/source/graphics/cgl/glcontext.cpp b/source/graphics/cgl/glcontext.cpp
index 7e06d2333aea4c631b0e956e0fbe6047d5380737..8283825063f3ded5ba2a4ac0d8c51e5e8d5d64f0 100644 (file)
--- a/source/graphics/cgl/glcontext.cpp
+++ b/source/graphics/cgl/glcontext.cpp
@@ -20,25 +20,25 @@ struct GLContext::Private
 void GLContext::platform_init(const GLOptions &opts)
 {
        vector<unsigned> attribs;
-       
+
        attribs.push_back(CPF_DEPTH_SIZE);
        attribs.push_back(1);
-       
+
        if(opts.alpha)
        {
                attribs.push_back(CPF_ALPHA_SIZE);
                attribs.push_back(1);
        }
-       
+
        if(opts.stencil)
        {
                attribs.push_back(CPF_STENCIL_SIZE);
                attribs.push_back(1);
        }
-       
+
        if(opts.doublebuffer)
                attribs.push_back(CPF_DOUBLEBUFFER);
-       
+
        if(opts.multisample>0)
        {
                attribs.push_back(CPF_SAMPLE_BUFFERS);

diff --git a/source/graphics/cocoa/display.cpp b/source/graphics/cocoa/display.cpp
index c6824b89fb38c66a0240adfebf348b855ac18111..9c4aa222280479316b708f5f55c624091dd2319d 100644 (file)
--- a/source/graphics/cocoa/display.cpp
+++ b/source/graphics/cocoa/display.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-Display::Display(const std::string &):
+Display::Display(const string &):
        priv(new Private)
 {
        static ErrorDialog err_dlg(0);

diff --git a/source/graphics/glx/glcontext.cpp b/source/graphics/glx/glcontext.cpp
index b3d8ed0565d867e6f8ab06df0095232d81c73e04..26275a4b6b7ee5cf6626b23f00abe6ddee92f4a2 100644 (file)
--- a/source/graphics/glx/glcontext.cpp
+++ b/source/graphics/glx/glcontext.cpp
@@ -23,26 +23,26 @@ struct GLContext::Private
 void GLContext::platform_init(const GLOptions &opts)
 {
        vector<int> attribs;
-       
+
        attribs.push_back(GLX_RGBA);
        attribs.push_back(GLX_DEPTH_SIZE);
        attribs.push_back(1);
-       
+
        if(opts.alpha)
        {
                attribs.push_back(GLX_ALPHA_SIZE);
                attribs.push_back(1);
        }
-       
+
        if(opts.stencil)
        {
                attribs.push_back(GLX_STENCIL_SIZE);
                attribs.push_back(1);
        }
-       
+
        if(opts.doublebuffer)
                attribs.push_back(GLX_DOUBLEBUFFER);
-       
+
        if(opts.multisample>0)
        {
                attribs.push_back(GLX_SAMPLE_BUFFERS_ARB);
@@ -50,7 +50,7 @@ void GLContext::platform_init(const GLOptions &opts)
                attribs.push_back(GLX_SAMPLES_ARB);
                attribs.push_back(opts.multisample);
        }
-       
+
        attribs.push_back(0);
 
        DisplayHandle dpy = display.get_private().display;

diff --git a/source/input/cocoa/keyboard.cpp b/source/input/cocoa/keyboard.cpp
index c2cdf353b6b6f54cec27638962c210dd6f819230..db097aaaa67d9a93c98b1e46f8b177d7256e5fdc 100644 (file)
--- a/source/input/cocoa/keyboard.cpp
+++ b/source/input/cocoa/keyboard.cpp
@@ -27,5 +27,5 @@ void Keyboard::input_event(const Graphics::Window::Event &event)
        }
 }
 
-} // namespace Inpus
+} // namespace Input
 } // namespace Msp

diff --git a/source/input/cocoa/keys.cpp b/source/input/cocoa/keys.cpp
index 7d64398be351a64b88b378ac7f63fd6dcf0c501a..f8515bb6bbe1cf178a8dd1af0d850c84056a64e4 100644 (file)
--- a/source/input/cocoa/keys.cpp
+++ b/source/input/cocoa/keys.cpp
@@ -3,7 +3,7 @@
 namespace Msp {
 namespace Input {
 
-unsigned sys_keymap[N_KEYS_]=
+unsigned sys_keymap[N_KEYS_] =
 {
        0, 0, 0, 0, 0, 0, 0, 0,
        8, 9, 10, 0, 0, 0, 0, 0,

diff --git a/source/input/windows/keys.cpp b/source/input/windows/keys.cpp
index 601146ed43aaba6e1622986b5cd085e21892d6b7..e4cd0dc9dc9468f61b118dd21de1854104e8b982 100644 (file)
--- a/source/input/windows/keys.cpp
+++ b/source/input/windows/keys.cpp
@@ -4,7 +4,7 @@
 namespace Msp {
 namespace Input {
 
-unsigned sys_keymap[N_KEYS_]=
+unsigned sys_keymap[N_KEYS_] =
 {
        0, 0, 0, 0, 0, 0, 0, 0,
        VK_BACK, VK_TAB, VK_RETURN, 0, 0, 0, 0, 0,

diff --git a/source/input/x11/keys.cpp b/source/input/x11/keys.cpp
index 751c2e2b9d0f1f4a50f1dee85f2ef2e2bae3c6ad..77cd95dbaa5966804b3fa129c4f22864b19557ec 100644 (file)
--- a/source/input/x11/keys.cpp
+++ b/source/input/x11/keys.cpp
@@ -4,7 +4,7 @@
 namespace Msp {
 namespace Input {
 
-unsigned sys_keymap[N_KEYS_]=
+unsigned sys_keymap[N_KEYS_] =
 {
        0, 0, 0, 0, 0, 0, 0, 0,
        XK_BackSpace, XK_Tab, XK_Return, 0, 0, 0, 0, 0,