Add Windows support.
This commit is contained in:
parent
ee51f3ee09
commit
683ba5447f
37 changed files with 477 additions and 113 deletions
|
@ -1,12 +1,11 @@
|
|||
#include "GuiApplication.h"
|
||||
|
||||
#include "Widget.h"
|
||||
#include "XcbInterface.h"
|
||||
#include "XcbKeyboard.h"
|
||||
//#include "XcbInterface.h"
|
||||
//#include "XcbKeyboard.h"
|
||||
#include "Window.h"
|
||||
#include "TextElement.h"
|
||||
#include "WindowManager.h"
|
||||
#include <iostream>
|
||||
#include "TextEditorView.h"
|
||||
#include "AudioEditorView.h"
|
||||
#include "ImageEditorView.h"
|
||||
|
@ -16,6 +15,8 @@
|
|||
#include "StatusBar.h"
|
||||
#include "HorizontalSpacer.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
GuiApplication::GuiApplication()
|
||||
: AbstractDesktopApp(),
|
||||
mMainApplication(),
|
||||
|
@ -74,18 +75,18 @@ void GuiApplication::Run()
|
|||
auto mainWindow = mDesktopManager->GetWindowManager()->GetMainWindow();
|
||||
SetUpWidget();
|
||||
|
||||
mDesktopManager->SetKeyboard(XcbKeyboard::Create());
|
||||
//mDesktopManager->SetKeyboard(XcbKeyboard::Create());
|
||||
|
||||
bool useOpenGl = false;
|
||||
XcbInterface window_interface;
|
||||
window_interface.SetUseOpenGl(useOpenGl);
|
||||
window_interface.Initialize();
|
||||
window_interface.AddWindow(mainWindow);
|
||||
window_interface.ShowWindow(mainWindow);
|
||||
if(useOpenGl)
|
||||
{
|
||||
window_interface.CreateOpenGlDrawable(mainWindow);
|
||||
}
|
||||
window_interface.Loop(mDesktopManager.get());
|
||||
window_interface.ShutDown();
|
||||
//bool useOpenGl = false;
|
||||
//XcbInterface window_interface;
|
||||
//window_interface.SetUseOpenGl(useOpenGl);
|
||||
//window_interface.Initialize();
|
||||
//window_interface.AddWindow(mainWindow);
|
||||
//window_interface.ShowWindow(mainWindow);
|
||||
//if(useOpenGl)
|
||||
//{
|
||||
// window_interface.CreateOpenGlDrawable(mainWindow);
|
||||
//}
|
||||
//window_interface.Loop(mDesktopManager.get());
|
||||
//window_interface.ShutDown();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue