Skip to content

Commit

Permalink
Removed the binaries directory from git. Moved bindings into sep file…
Browse files Browse the repository at this point in the history
…s plus external reference to main_loop_level. Changed some other files for house keeping.

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
  • Loading branch information
ncb000gt committed May 22, 2010
1 parent 4fa14db commit 712efcf
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 108 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/
*.o
.lock-wscript
9 changes: 0 additions & 9 deletions .lock-wscript

This file was deleted.

3 changes: 2 additions & 1 deletion bindings/gtk-alert.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
#include <iostream>
using namespace v8;

// Alert ----------------------------------
extern int main_loop_level;

// Alert ----------------------------------
Handle<Value>
Alert(const Arguments& args)
{
Expand Down
2 changes: 1 addition & 1 deletion bindings/gtk-node.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
using namespace v8;

//global var
static int main_loop_level = 0;
extern int main_loop_level;
4 changes: 4 additions & 0 deletions bindings/gtk-window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "gtk-node.h"

#include <iostream>
#include <stdio.h>
using namespace v8;

// Window ----------------------------------
Expand All @@ -17,7 +18,10 @@ window_show(const Arguments& args)

gtk_widget_show_all(wnd);

std::cout << "Loop level: " << main_loop_level;

main_loop_level++;
std::cout << "Loop level: " << main_loop_level;
if (main_loop_level == 1) {
v8::Handle<v8::Value> onShow = windowObject->Get(String::New("onShow"));
if (onShow->IsFunction()) {
Expand Down
4 changes: 4 additions & 0 deletions bindings/gtk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
#include "gtk-vbox.h"

#include <iostream>
#include <stdio.h>
using namespace v8;

//global var
int main_loop_level = 0;

Handle<Value>
main_iteration(const Arguments& args)
{
Expand Down
Binary file removed build/.wafpickle-7
Binary file not shown.
2 changes: 0 additions & 2 deletions build/c4che/build.config.py

This file was deleted.

53 changes: 0 additions & 53 deletions build/c4che/default.cache.py

This file was deleted.

39 changes: 0 additions & 39 deletions build/config.log

This file was deleted.

Binary file removed build/default/bindings/gtk_1.o
Binary file not shown.
Binary file removed build/default/gtk.node
Binary file not shown.
4 changes: 2 additions & 2 deletions gtk.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var gtk=require('./build/default/gtk');
var gtk=require('./build/default/node-gtk');
var sys=require('sys');

exports.main = function() {
Expand All @@ -13,7 +13,7 @@ exports.window = function(params) {
if (params.width != null || params.height != null) window.setSize(params.width, params.height);
if (params.onClose != null) window.onClose(params.onClose);
window.onShow = exports.main;

window.container = exports.v({items: params.items});
window.add(window.container);
window.add = function(obj) {
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ all:
tests:
node ./test.js
install:
cp ./build/default/node-gtk.node /usr/local/lib/node/libraries/node-gtk.node
cp ./build/default/node-gtk.node ~/.node_libraries/node-gtk.node
clean:
rm -rf ./build

0 comments on commit 712efcf

Please sign in to comment.