← Back to branch summary

~unity-team/nux/nux-remove-glew-mx

« back to all changes in this revision

Viewing changes to Nux/FloatingWindow.cpp

  • Committer: Jay Taoko
  • Date: 2011-05-30 02:54:31 UTC
  • mfrom: (353.1.1 nux)
  • Revision ID: jay.taoko@canonical.com-20110530025431-kpqcnbcq3apsfz92
* Object::Dispose() now does the same thing as Object::UnReference()
* Fixed memory leak in UXTheme::Load2DTextureFile
* Mesh Resource manager
    - Fixed mesh Resource manager pipeline
    - See example ProgObjMeshLoader

* Fixed GLSL Shaders in FontRendering.cpp
    - removed global variable USE_ARB_SHADERS and replaced with GraphicsEngine::UsingGLSLCodePath()

* Removing files IniFile.cpp/.h
* Removing files UIColorTheme.cpp/.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/FloatingWindow.cpp
94
94
    SetGeometry (Geometry (100, 100, 320, 200) );
95
95
 
96
96
    NString Path = NUX_FINDRESOURCELOCATION (TEXT ("UITextures/AddButton.png") );
97
 
    MinimizeIcon = GetGpuDevice()->CreateSystemCapableTexture ();
 
97
    MinimizeIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture ();
98
98
    MinimizeIcon->Update (Path.GetTCharPtr() );
99
99
    Path = NUX_FINDRESOURCELOCATION (TEXT ("UITextures/CancelButton.png") );
100
 
    CloseIcon = GetGpuDevice()->CreateSystemCapableTexture ();
 
100
    CloseIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture ();
101
101
    CloseIcon->Update (Path.GetTCharPtr() );
102
102
 
103
103
    SetWindowTitle (WindowName);
369
369
 
370
370
    if (m_configure_notify_callback)
371
371
    {
372
 
      (*m_configure_notify_callback) (GetThreadGLWindow()->GetWindowWidth(), GetThreadGLWindow()->GetWindowHeight(), geo, m_configure_notify_callback_data);
 
372
      (*m_configure_notify_callback) (GetGraphicsDisplay()->GetWindowWidth(), GetGraphicsDisplay()->GetWindowHeight(), geo, m_configure_notify_callback_data);
373
373
 
374
374
      if (geo.IsNull() )
375
375
      {