Really fixed sdl_gui_navit compilation problems

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@537 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/gui/sdl/gui_sdl.h b/navit/src/gui/sdl/gui_sdl.h
index 1519084..d3d530e 100644 (file)
--- a/navit/src/gui/sdl/gui_sdl.h
+++ b/navit/src/gui/sdl/gui_sdl.h
@@ -8,6 +8,8 @@ struct statusbar_methods;
 struct menu_methods;
 struct navit;
 
+extern struct navit *sdl_gui_navit;
+
 struct gui_priv {
 /*
         GtkWidget *win;

diff --git a/navit/src/gui/sdl/gui_sdl_window.cpp b/navit/src/gui/sdl/gui_sdl_window.cpp
index 302e51f..643e9cf 100644 (file)
--- a/navit/src/gui/sdl/gui_sdl_window.cpp
+++ b/navit/src/gui/sdl/gui_sdl_window.cpp
@@ -44,6 +44,8 @@ GLdouble upX=0;
 GLdouble upY=-1;
 GLdouble upZ=0;
 
+struct navit *sdl_gui_navit;
+
 #include <CEGUI/RendererModules/OpenGLGUIRenderer/openglrenderer.h>
 #include "CEGUIDefaultResourceProvider.h"
 CEGUI::OpenGLRenderer* renderer;

diff --git a/navit/src/gui/sdl/sdl_events.cpp b/navit/src/gui/sdl/sdl_events.cpp
index db43c30..e6654f2 100644 (file)
--- a/navit/src/gui/sdl/sdl_events.cpp
+++ b/navit/src/gui/sdl/sdl_events.cpp
@@ -35,6 +35,7 @@ static struct search_param {
 } search_param;
 
 // extern "C" struct navit *global_navit;
+// 
 
 void route_to(int x,int y){
        struct coord pos;
@@ -390,7 +391,6 @@ bool DialogWindowSwitch(const CEGUI::EventArgs& event)
 {
        using namespace CEGUI;
 
-//     extern struct navit *sdl_gui_navit;
 
        extern CEGUI::Window* myRoot;
        const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);

diff --git a/navit/src/gui/sdl/sdl_events.h b/navit/src/gui/sdl/sdl_events.h
index ca594f2..6061330 100644 (file)
--- a/navit/src/gui/sdl/sdl_events.h
+++ b/navit/src/gui/sdl/sdl_events.h
@@ -8,7 +8,7 @@
 #define SRCH_STREET 3
 #define SRCH_NUMBER 4
 
-extern struct navit *sdl_gui_navit;
+
 
 bool handleItemSelect(int r);
 bool ItemSelect(const CEGUI::EventArgs& event);