PyCrust updates

[wxWidgets.git] / src / mgl / window.cpp

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 346c33f826b60b550786d07ef1a336eaec7817dd..f749bc125181cde32ea47f17a9c967588befa15e 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -118,7 +118,7 @@ static void CaptureScreenshot()
 // MGL_WM hooks:
 // ---------------------------------------------------------------------------
 
 // MGL_WM hooks:
 // ---------------------------------------------------------------------------
 

-static void wxWindowPainter(window_t *wnd, MGLDC *dc)
+static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc)

 {
     wxWindowMGL *w = (wxWindow*) wnd->userData;
     
 {
     wxWindowMGL *w = (wxWindow*) wnd->userData;
     


@@ -129,7 +129,7 @@ static void wxWindowPainter(window_t *wnd, MGLDC *dc)
     }
 }
 
     }
 }
 

-static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
+static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)

 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
     wxPoint orig(win->GetClientAreaOrigin());
 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
     wxPoint orig(win->GetClientAreaOrigin());


@@ -374,7 +374,7 @@ static long wxAsciiToKeyCode(event_t *event)
     return (long)EVT_asciiCode(event->message);
 }
 
     return (long)EVT_asciiCode(event->message);
 }
 

-static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
+static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)

 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
 
 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
 


@@ -469,12 +469,14 @@ END_EVENT_TABLE()
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

+extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+

 void wxWindowMGL::Init()
 {
     // First of all, make sure window manager is up and running. If it is
     // not the case, initialize it in default display mode
     if ( !g_winMng )
 void wxWindowMGL::Init()
 {
     // First of all, make sure window manager is up and running. If it is
     // not the case, initialize it in default display mode
     if ( !g_winMng )

-        wxTheApp->SetDisplayMode(wxDisplayModeInfo(640, 480, 16));
+        wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode());

 
     // generic:
     InitBase();
 
     // generic:
     InitBase();