Merge
This commit is contained in:
commit
2527a65848
@ -1,6 +1,8 @@
|
|||||||
Beta Disclaimar
|
Beta Disclaimar
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
First a screenshot of how it looks: https://dl.dropbox.com/u/5205843/RocketEditor.png
|
||||||
|
|
||||||
As currently this version of the editor is in beta and there *WILL* be bugs (backup your stuff before using this)
|
As currently this version of the editor is in beta and there *WILL* be bugs (backup your stuff before using this)
|
||||||
|
|
||||||
If you encounter any issues please try to report them at https://github.com/emoon/rocket/issues?milestone=3 as
|
If you encounter any issues please try to report them at https://github.com/emoon/rocket/issues?milestone=3 as
|
||||||
|
|||||||
@ -165,7 +165,9 @@ bool createWindow(const wchar_t* title, int width, int height)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Editor_create();
|
||||||
|
|
||||||
getRecentFiles();
|
getRecentFiles();
|
||||||
Window_buildMenu();
|
Window_buildMenu();
|
||||||
Window_populateRecentList(Editor_getRecentFiles());
|
Window_populateRecentList(Editor_getRecentFiles());
|
||||||
@ -173,7 +175,6 @@ bool createWindow(const wchar_t* title, int width, int height)
|
|||||||
ShowWindow(s_window, SW_SHOW);
|
ShowWindow(s_window, SW_SHOW);
|
||||||
SetForegroundWindow(s_window);
|
SetForegroundWindow(s_window);
|
||||||
SetFocus(s_window);
|
SetFocus(s_window);
|
||||||
Editor_create();
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user