Changeset 30276 for lang/cplusplus/i3

Show
Ignore:
Timestamp:
02/19/09 18:52:56 (4 years ago)
Author:
saturday06
Message:

foo

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

Legend:

Unmodified
Added
Removed

  • lang/cplusplus/i3/trunk/am/i3.am

    r30275 r30276  
    8080 
    8181# --------------------------------------- 
    82 # fltk 
    83 if WITH_GUI_FLTK 
     82# gnustep 
     83if WITH_GUI_GNUSTEP 
    8484i3_CXXFLAGS_DEFAULT += -DMOL_GUI_GNUSTEP 
    85 i3_CXXFLAGS_RELEASE += ${FLTK2_CXXFLAGS} 
    86 i3_LDADD_RELEASE    += ${FLTK2_LDFLAGS} 
     85i3_CXXFLAGS_RELEASE += ${GNUSTEP2_CXXFLAGS} 
     86i3_LDADD_RELEASE    += ${GNUSTEP2_LDFLAGS} 
    8787endif 
    8888 
    8989# --------------------------------------- 
    9090# Qt 
    91 if WITH_GUI_QT 
    92 i3_CXXFLAGS_DEFAULT += ${QT_CXXFLAGS} -DMOL_GUI_COCOA \ 
    93                        -I${QT_INCLUDES}/QtGui -I${QT_INCLUDES}/QtCore 
    94 i3_LDADD_DEFAULT    += ${QT_LDADD} ${QT_LIB_GUI} 
     91if WITH_GUI_COCOA 
     92i3_CXXFLAGS_DEFAULT += ${COCOA_CXXFLAGS} -DMOL_GUI_COCOA \ 
     93                       -I${COCOA_INCLUDES}/QtGui -I${COCOA_INCLUDES}/QtCore 
     94i3_LDADD_DEFAULT    += ${COCOA_LDADD} ${COCOA_LIB_GUI} 
    9595 
    9696if WITH_OS_WINDOWS 

  • lang/cplusplus/i3/trunk/am/i3_debug.am

    r30207 r30276  
    2626            ${top_srcdir}/src/mol/include/mol/os-unix/PrecompiledHeaders.h \ 
    2727            ${top_srcdir}/src/mol/include/mol/gui-windows/PrecompiledHeaders.h \ 
    28             ${top_srcdir}/src/mol/include/mol/gui-qt/PrecompiledHeaders.h 
     28            ${top_srcdir}/src/mol/include/mol/gui-cocoa/PrecompiledHeaders.h 
    2929 
    3030        $(MKDIR_P) gch/i3_debug 
    … …  
    4141 
    4242# --------------------------------------- 
    43 # fltk 
    44 if WITH_GUI_FLTK 
     43# gnustep 
     44if WITH_GUI_GNUSTEP 
    4545i3_CXXFLAGS_DEBUG += 
    4646i3_LDFLAGS_DEBUG  +=  
    47 i3_LDADD_DEBUG    += ${FLTK2_LIBS} 
     47i3_LDADD_DEBUG    += ${GNUSTEP2_LIBS} 
    4848if WITH_CYGWIN  
    4949i3_LDADD_DEBUG    += -lmsimg32 -lole32 -luuid -lcomctl32 -lwsock32 -lsupc++ -luser32 -lgdi32 
    5050else 
    51 i3_LDADD_DEBUG    += -L/usr/local/lib -lfltk2 -lX11 -lXi -lXinerama -lXft -lpthread -lm -lXext -lsupc++ 
     51i3_LDADD_DEBUG    += -L/usr/local/lib -lgnustep2 -lX11 -lXi -lXinerama -lXft -lpthread -lm -lXext -lsupc++ 
    5252endif 
    5353endif 

  • lang/cplusplus/i3/trunk/am/mol_test.am

    r22398 r30276  
    2828 
    2929# --------------------------------------- 
    30 # fltk 
    31 if WITH_GUI_FLTK 
    32 mol_test_CXXFLAGS += ${FLTK2_CXXFLAGS} 
    33 mol_test_LDADD    += ${FLTK2_LDFLAGS} 
     30# gnustep 
     31if WITH_GUI_GNUSTEP 
     32mol_test_CXXFLAGS += ${GNUSTEP2_CXXFLAGS} 
     33mol_test_LDADD    += ${GNUSTEP2_LDFLAGS} 
    3434endif 

  • lang/cplusplus/i3/trunk/am/mol_test_debug.am

    r30207 r30276  
    2525            ${top_srcdir}/src/mol/include/mol/os-unix/PrecompiledHeaders.h \ 
    2626            ${top_srcdir}/src/mol/include/mol/gui-windows/PrecompiledHeaders.h \ 
    27             ${top_srcdir}/src/mol/include/mol/gui-qt/PrecompiledHeaders.h 
     27            ${top_srcdir}/src/mol/include/mol/gui-cocoa/PrecompiledHeaders.h 
    2828 
    2929        $(MKDIR_P) gch/mol_test_debug/mol 
    … …  
    4545 
    4646# --------------------------------------- 
    47 # fltk 
    48 if WITH_GUI_FLTK 
     47# gnustep 
     48if WITH_GUI_GNUSTEP 
    4949mol_test_debug_CXXFLAGS += 
    50 mol_test_debug_LDADD    += ${FLTK2_LIBS} 
     50mol_test_debug_LDADD    += ${GNUSTEP2_LIBS} 
    5151endif 

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

    r30248 r30276  
    1919 
    2020// !!! 
    21 #define QT_NO_CAST_FROM_ASCII 
     21#define COCOA_NO_CAST_FROM_ASCII 
    2222 

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

    r23714 r30276  
    66int global_loop() 
    77{ 
    8     return fltk::run(); 
     8    return gnustep::run(); 
    99} 
    1010void alert(string message) 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/Gui.h

    r23169 r30276  
    11#pragma once 
    22 
    3 #include <fltk/Window.h> 
    4 #include <fltk/Widget.h> 
    5 #include <fltk/Button.h> 
    6 #include <fltk/run.h> 
     3#include <gnustep/Window.h> 
     4#include <gnustep/Widget.h> 
     5#include <gnustep/Button.h> 
     6#include <gnustep/run.h> 
    77 
    88#ifdef ENABLE_NLS 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/InputWindowCore.cpp

    r29237 r30276  
    2424void InputWindowCore<InputWindow>::createUI() 
    2525{ 
    26     using namespace fltk; 
     26    using namespace gnustep; 
    2727    /* 
    2828    window.begin(); 

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

    r23714 r30276  
    55{ 
    66 
    7 const char* QT_CODESET = "UTF-16LE"; 
     7const char* COCOA_CODESET = "UTF-16LE"; 
    88 
    99void alert(string message) 
    … …  
    1919        bindtextdomain(PACKAGE_NAME, LOCALEDIR); 
    2020        textdomain(PACKAGE_NAME); 
    21         bind_textdomain_codeset(PACKAGE_NAME, QT_CODESET); 
     21        bind_textdomain_codeset(PACKAGE_NAME, COCOA_CODESET); 
    2222    } 
    2323#else 

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

    r19866 r30276  
    11#pragma once 
    22 
    3 #define QT_NO_CAST_FROM_ASCII 
     3#define COCOA_NO_CAST_FROM_ASCII 
    44#include <QApplication> 
    55#include <QLabel> 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/gui-cocoa/GuiModule.h

    r29237 r30276  
    33#include "../Module.h" 
    44 
    5 #include <fltk/Window.h> 
    6 #include <fltk/Widget.h> 
    7 #include <fltk/Button.h> 
    8 #include <fltk/run.h> 
     5#include <gnustep/Window.h> 
     6#include <gnustep/Widget.h> 
     7#include <gnustep/Button.h> 
     8#include <gnustep/run.h> 
    99 
    1010namespace mol 
    … …  
    3030    bool breakLoopRequest; 
    3131public: 
    32     fltk::Window window; 
     32    gnustep::Window window; 
    3333    void loop() 
    3434    { 
    … …  
    3838        } 
    3939 
    40         fltk::run(); 
     40        gnustep::run(); 
    4141    } 
    4242 

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

    r16064 r30276  
    66#pragma once 
    77 
    8 #define QT_NO_CAST_FROM_ASCII 
     8#define COCOA_NO_CAST_FROM_ASCII 
    99#include <QApplication> 
    1010#include <QLabel>