Changeset 30959

Show
Ignore:
Timestamp:
03/08/09 23:15:15 (4 years ago)
Author:
saturday06
Message:

compiz fusion

Location:
lang/cplusplus/i3/trunk
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • lang/cplusplus/i3/trunk/configure.ac

    r30765 r30959  
    126126# 
    127127 
    128 AX_BOOST_BASE([1.35.0]) 
     128AX_BOOST_BASE([1.38.0]) 
    129129#AX_BOOST_PROGRAM_OPTIONS 
    130130#AX_BOOST_UNIT_TEST_FRAMEWORK 

  • lang/cplusplus/i3/trunk/src/Common.h

    r30459 r30959  
    1717 
    1818#include <iconv.h> 
     19 
     20#ifdef ENABLE_NLS 
    1921#include <libintl.h> 
     22#endif 
    2023 
    2124//#include <argtable2.h> 

  • lang/cplusplus/i3/trunk/src/Main.cpp

    r30461 r30959  
    3232        } 
    3333    } 
    34     //alert(_("bye")); 
     34 
    3535    return EXIT_SUCCESS; 
    3636} 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/Gui.cpp

    r30881 r30959  
    3434    { 
    3535        //char foo[sizeof(NSObject)]; 
    36         NSObject obj; 
    37         NSObject* objptr = &obj; 
    38         memset(objptr, 0, sizeof(*objptr)); 
    39         [objptr init]; 
     36        //NSObject obj; 
     37        //NSObject* objptr = &obj; 
     38        //memset(objptr, 0, sizeof(*objptr)); 
     39        //[objptr init]; 
    4040        [NSApp run]; 
    4141        return 0; 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/Thread.h

    r30881 r30959  
    44#ifdef MOL_GUI_GNUSTEP 
    55inline static void* init_thread() { 
    6     [NSApplication sharedApplication]; 
    7     return [[NSAutoreleasePool alloc] init]; 
     6    //[NSApplication sharedApplication]; 
     7    //return [[NSAutoreleasePool alloc] init]; 
     8    return NULL; 
    89} 
    910inline static void release_thread(void* p) { 
    10     [static_cast<NSAutoreleasePool*>(p) dealloc]; 
     11    if (p) { 
     12        //[static_cast<NSAutoreleasePool*>(p) dealloc]; 
     13    } 
    1114} 
    1215#else 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/gui-gnustep/PrecompiledHeaders.h

    r30432 r30959  
    77 
    88extern "C" { 
    9 #import <Cocoa/Cocoa.h> 
     9#import <Foundation/Foundation.h> 
     10#import <AppKit/AppKit.h> 
    1011} 
    1112 

  • lang/cplusplus/i3/trunk/src/os-windows/Os.cpp

    r30765 r30959  
    339339{ 
    340340#if defined(UNICODE) || defined(_UNICODE) 
     341#ifdef ENABLE_NLS 
    341342    Utf8ToUtf16Stream s(stderr); 
    342343    struct fp_func fp_func = {s}; 
    … …  
    345346    bind_textdomain_codeset(PACKAGE_NAME,"UTF-16LE"); 
    346347#else 
     348    exit_status e = i3::execute_popt((size_t)argc, (const char**)argv, boost::lambda::constant(stdout)); 
     349#endif 
     350#else 
     351#ifdef ENABLE_NLS 
    347352    const char* codeset = bind_textdomain_codeset(PACKAGE_NAME,NULL); 
    348353    bind_textdomain_codeset(PACKAGE_NAME,"UTF-8"); 
    349354    exit_status e = i3::execute_popt((size_t)argc, (const char**)argv, boost::lambda::constant(stdout)); 
    350355    bind_textdomain_codeset(PACKAGE_NAME,codeset); 
     356#else 
     357    exit_status e = i3::execute_popt((size_t)argc, (const char**)argv, boost::lambda::constant(stdout)); 
     358#endif 
    351359#endif 
    352360    return e; 

  • lang/cplusplus/i3/trunk/src/os-windows/Os.h

    r25972 r30959  
    33#include "WindowsCommon.h" 
    44 
     5#ifdef ENABLE_NLS 
    56#include "wlibintl.h" 
     7#endif 
     8 
    69// disable POSIX/XSI format strings 
    710#undef fprintf