ogremeshy/ogremeshy-1.1-paths.diff

   1 --- wxOgreMeshViewerMainFrameImpl.cpp   2011-03-05 08:55:03.000000000 -0700
   2 +++ wxOgreMeshViewerMainFrameImpl.new.cpp       2011-07-04 22:30:01.909307039 -0700
   3 @@ -21,6 +21,7 @@
   4  #include <wx/colordlg.h>
   5  #include <wx/aboutdlg.h>
   6  #include <wx/filename.h>
   7 +#include <wx/utils.h>
   8  #include "Core/wxOgreMeshViewerMainFrameImpl.h"
   9
  10  #include "Core/wxOgreRenderWindow.h"
  11 @@ -63,7 +64,12 @@ MeshyMainFrameImpl::MeshyMainFrameImpl(
  12                         m_wasLeftPressed( false ),
  13                         m_wasRightPressed( false )
  14  {
  15 -       SetIcon( wxIcon(wxT("OgreIcon")) ); //This probably only works in Windows
  16 +#ifndef __WXMSW__
  17 +        //Set config directory to user home directory
  18 +        m_configDirectory = std::string(wxGetHomeDir().mb_str()) + "/.ogremeshy/";
  19 +#endif
  20 +
  21 +        SetIcon( wxIcon(wxT("OgreIcon")) ); //This probably only works in Windows
  22
  23         //wxFormBuilder doesn't allow default disabled for toolbars
  24         m_toolBar->EnableTool( wxID_MENUSHOWBONES, false );
  25 @@ -281,7 +287,7 @@ void MeshyMainFrameImpl::loadSettings()
  26  //-----------------------------------------------------------------------------
  27  void MeshyMainFrameImpl::initOgre( bool bForceSetup )
  28  {
  29 -       m_root = new Ogre::Root( "Plugins.cfg", m_configDirectory + "ogre.cfg",
  30 +        m_root = new Ogre::Root( m_configDirectory + "Plugins.cfg", m_configDirectory + "ogre.cfg",
  31                                                                 m_configDirectory + "Ogre.log"  );
  32         Ogre::LogManager::getSingleton().getDefaultLog()->addListener( this );
  33         if( bForceSetup || !m_root->restoreConfig() )