Nux

Merge lp://qastaging/~jaytaoko/nux/nux-deprecated-api into lp://qastaging/nux/2.0

nux-deprecated-api
Merge into 2.0

Proposed by Jay Taoko on 2012-01-02

Status:	Merged
Approved by:	Jay Taoko on 2012-01-03
Approved revision:	532
Merged at revision:	532
Proposed branch:	lp://qastaging/~jaytaoko/nux/nux-deprecated-api
Merge into:	lp://qastaging/nux/2.0
Diff against target:	2054 lines (+465/-318) 36 files modified Nux/Area.cpp (+8/-8) Nux/Area.h (+2/-2) Nux/BaseWindow.cpp (+9/-9) Nux/Canvas.cpp (+1/-1) Nux/ComboBoxSimple.cpp (+2/-2) Nux/FloatingWindow.cpp (+1/-1) Nux/HSplitter.cpp (+2/-2) Nux/InputArea.cpp (+12/-12) Nux/MenuBar.cpp (+5/-5) Nux/MenuPage.cpp (+5/-5) Nux/Nux.cpp (+0/-27) Nux/Nux.h (+0/-7) Nux/Painter.cpp (+5/-5) Nux/PangoText.cpp (+1/-1) Nux/StaticText.cpp (+17/-10) Nux/StaticText.h (+31/-5) Nux/TextEntry.cpp (+50/-50) Nux/TextEntry.h (+2/-2) Nux/TextureArea.cpp (+0/-2) Nux/Theme.h (+4/-0) Nux/TimerProc.cpp (+22/-13) Nux/VLayout.cpp (+0/-1) Nux/VSplitter.cpp (+2/-2) Nux/WindowCompositor.cpp (+93/-93) Nux/WindowThread.h (+0/-24) NuxGraphics/GpuDevice.h (+5/-0) NuxGraphics/GraphicsDisplayX11.cpp (+39/-22) NuxGraphics/GraphicsEngine.h (+3/-0) NuxImage/CairoGraphics.cpp (+6/-0) NuxImage/CairoGraphics.h (+2/-0) configure.ac (+1/-1) tests/Makefile.am (+32/-1) tests/nux_automated_test_framework.cpp (+5/-5) tests/test-nux-main.cpp (+13/-0) tests/test-nux-statictext.cpp (+52/-0) tests/test-nux-windowthread.cpp (+33/-0)
To merge this branch:	bzr merge lp://qastaging/~jaytaoko/nux/nux-deprecated-api
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jason Smith (community)		2012-01-02	Approve on 2012-01-02
Review via email: mp+87269@code.qastaging.launchpad.net

Description of the change

* Removed API:
   GraphicsDisplay& GetWindow();
   GraphicsEngine& GetGraphicsEngine();
   NThread* GetThreadApplication();
   WindowThread* GetGraphicsThread();

* Modified code to to use GetWindowThread() to access its internal objects.

* Added tests:
- WindowThread
- StaticText

Revision history for this message

Jason Smith (jassmith) on 2012-01-02:

review: Approve

lp://qastaging/~jaytaoko/nux/nux-deprecated-api updated on 2012-01-03

530. By Andrea Azzarone on 2012-01-02: Makes sure that the scroll wheel works with nux::VScrollbar. Fixes: https://bugs.launchpad.net/bugs/888819. Appoved by Jay Taoko.
531. By Jay Taoko on 2012-01-03: Added separate file for GLib main loop functions
* Cleanup: variable renaming
* Marked some functions as obsolete
* Core objects take the WindowThread as a constructor parameters: Painter, WindowCompositor.... Fixes: . Appoved by Jason Smith.
532. By Jay Taoko on 2012-01-03: * Changed ABI version
* Merged with trunk