Changeset 141


Ignore:
Timestamp:
Dec 3, 2006, 12:55:29 PM (19 years ago)
Author:
cinc
Message:

Implemented wpSetTitle()/wpQueryTitle() and fixed some glitches.

Location:
trunk/desktop
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/desktop/Makefile

    r127 r141  
    1818
    1919TKIDLDIR        =       $(NOMPATH)/idl  # The object TK lives here
     20IDLINC          =       --include=$(FOUNDATIONPATH)/idl
    2021
    2122#INC            =       ./include -I $(NOMPATH)/include -I $(NOMPATH)/class_h
    2223INC             =       ./include -I ./class_h -I $(NOMPATH)/class_h -I $(NOMPATH)/include \
    23                         -I $(GUITKPATH)/class_h -I $(GUITKPATH)/include
     24                        -I $(GUITKPATH)/class_h -I $(GUITKPATH)/include -I $(FOUNDATIONPATH)/class_h \
     25                        -I $(FOUNDATIONPATH)/include
    2426
    2527ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
    26 CLASSDLLLIBS    =       -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voyguitk
     28CLASSDLLLIBS    =       -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voyguitk -l$(OBJDIR)/voyfcls
     29GCLIB           =       -l$(OBJDIR)/gc
    2730
    2831# Define objects to build
    … …  
    4750        @echo "[33;1;mLinking "$@"...[0;m"
    4851        cmd.exe /C .\src\create_vdesktop_def $(OBJDIR)/vdesktop.def
    49         $(CC) $(GCCLDFLAGSDLL)  -o $@ $(DLLOBJECTS) $(LIBS) $(ADDLIBS) $(OBJDIR)/vdesktop.def
     52        $(CC) $(GCCLDFLAGSDLL)  -o $@ $(DLLOBJECTS) $(LIBS) $(ADDLIBS) $(GCLIB) $(OBJDIR)/vdesktop.def
    5053        @echo "[32;1;mDone linking "$@"...[0;m"
    5154
    … …  
    6568###################################
    6669
    67 BASE_NOMCOMPILEH        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --header --output-dir=$(CLASSINC) $<
    68 BASE_NOMCOMPILEIH       =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
    69 BASE_NOMCOMPILEC        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $<
     70BASE_NOMCOMPILEH        =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
     71BASE_NOMCOMPILEIH       =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
     72BASE_NOMCOMPILEC        =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $<
    7073
    7174
    … …  
    7477        $(CC) -I $(INC) $(GCCFLAGS)  -o$@ $<
    7578
    76 $(OBJDIR)/%.o:  $(CLASSCDIR)/%.c
     79$(OBJDIR)/helper.o:     $(CLASSCDIR)/helper.c
    7780        $(CC) -I $(INC) $(GCCFLAGS)  -o$@ $<
    7881
    … …  
    8184        $(BASE_NOMCOMPILEH)
    8285        $(BASE_NOMCOMPILEC)
     86
     87$(CLASSINC)/%.h:        $(IDLDIR)/%.idl
     88        $(BASE_NOMCOMPILEH)
    8389
    8490$(OBJDIR)/%.o:  $(CDIR)/%.c

  • trunk/desktop/class_c/wpfilesystem.c

    r98 r141  
    3939#include <os2.h>
    4040
     41#include "nom.h"
     42#include "nomtk.h"
     43
    4144#include <string.h>
    4245#include "wpfilesystem.ih"
    … …  
    4649/* WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf); */
    4750
     51  nomPrintf("thePath: ---> %s \n", fullPath);
    4852}
    4953

  • trunk/desktop/class_c/wpfolder.c

    r127 r141  
    253253    case OPEN_DEFAULT:
    254254      {
     255        WPFolder_wpCreateFolderWindow(nomSelf, ev);
    255256#if 0
    256257        char path[CCHMAXPATH];
    … …  
    334335
    335336
    336 
    337 
    338 
     337NOM_Scope void NOMLINK impl_WPFolder_tstSetFolderPath(WPFolder* nomSelf, const CORBA_char * thePath, CORBA_Environment *ev)
     338{
     339/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
     340
     341
     342}
     343
     344
     345
     346

  • trunk/desktop/class_c/wpobject.c

    r122 r141  
    124124  //g_mutex_free(_gObjectMutex);
    125125  DosCloseMutexSem(_gObjectMutex);
    126   WPObject_nomUninit_parent(nomSelf, ev);
     126  WPObject_nomUninit_parent((NOMObject*)nomSelf, ev);
    127127}
    128128
    129129NOM_Scope void NOMLINK impl_WPObject_wpInitData(WPObject* nomSelf, CORBA_Environment *ev)
    130130{
    131 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
    132 
     131  WPObjectData* nomThis=WPObjectGetData(nomSelf);
     132
     133  /* Make sure a title exists (even if it's an empty string */
     134  _pnomStringTitle=NOMStringNew();
    133135}
    134136
    … …  
    195197  return DosReleaseMutexSem(_gObjectMutex);
    196198}
     199
     200NOM_Scope PNOMString NOMLINK impl_WPObject_wpSetTitle(WPObject* nomSelf, const PNOMString pnomStrNewTitle, CORBA_Environment *ev)
     201{
     202  WPObjectData* nomThis=WPObjectGetData(nomSelf);
     203
     204  NOMString_assignString(_pnomStringTitle, pnomStrNewTitle, ev);
     205
     206  return _pnomStringTitle;
     207}
     208
     209NOM_Scope PNOMString NOMLINK impl_WPObject_wpQueryTitle(WPObject* nomSelf, CORBA_Environment *ev)
     210{
     211  WPObjectData* nomThis=WPObjectGetData(nomSelf);
     212
     213  return _pnomStringTitle;
     214}
     215

  • trunk/desktop/exports.def

    r99 r141  
    88        _WPObjectCClassData
    99        WPObjectNewClass   
    10 
    1110;       _M_WPObjectClassData
    1211;       _M_WPObjectCClassData
    … …  
    3029        _WPDataFileCClassData
    3130        WPDataFileNewClass
    32 
    3331;       _M_WPDataFileClassData
    3432;       _M_WPDataFileCClassData

  • trunk/desktop/idl/wpfolder.idl

    r125 r141  
    3737
    3838#include "wpfilesystem.idl"
     39#include "nomfilepath.idl"
    3940
    4041NOMCLASSNAME(WPFolder);
    … …  
    4849                  in boolean fFoldersOnly);
    4950  gpointer wpCreateFolderWindow();
    50 
     51  void tstSetFolderPath(in string thePath); /* Only for testing */
    5152#if 0
    5253  WPObject wpQueryContent(in WPObject Object,
    … …  
    6162
    6263  NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData);
     64  NOMINSTANCEVAR(PNOMPath pnomPath);
    6365};
    6466

  • trunk/desktop/idl/wpobject.idl

    r125 r141  
    3939
    4040#include "wpnativetypes.idl"
     41#include "nomstring.idl"
    4142
    4243//interface WPFolder;
    … …  
    6970  gpointer wpQueryIcon();
    7071  unsigned long  wpRequestObjectMutexSem(in unsigned long ulReserved);
    71   unsigned long     wpReleaseObjectMutexSem();
     72  unsigned long  wpReleaseObjectMutexSem();
    7273  /*  boolean wpSetFolder(in WPFolder wpParentFolder); */
     74
     75  PNOMString wpSetTitle(in PNOMString pnomStrNewTitle);
     76  PNOMString wpQueryTitle();
    7377
    7478  /* Methods overriden by this class */
    … …  
    8185  NOMINSTANCEVAR(HMUX gObjectMutex);
    8286  NOMINSTANCEVAR(PGSList glstObjectInUse);
     87  NOMINSTANCEVAR(PNOMString pnomStringTitle);
    8388
    8489};

  • trunk/desktop/src/vdesktop.c

    r113 r141  
    3737#include <os2.h>
    3838#include <stdio.h>
     39#include <stdlib.h>
    3940#include <gtk/gtk.h>
    4041#include "debug_window.h"
     42#include <gc.h>
    4143
    4244#include "nom.h"
    … …  
    4446#include "wpobject.h"
    4547#include "wpfolder.h"
     48#include "desktoptypes.h"
    4649
    4750int createQuitWindow(void);
    … …  
    5356/* Desktop folder */
    5457WPFolder *wpDesktop;
    55 
    56 
    5758/*
    5859  Main entry point. This function is called from the EMX wrapper. Be aware that gtk_init()
    … …  
    6263{
    6364 char desktopDir[CCHMAXPATH]={0};
    64  
    65  g_message("We started...\n");   
     65
     66 g_message("We started...\n");
     67
    6668
    6769#if 0
    … …  
    103105    wpDesktop=WPFolderNew();
    104106    dbgPrintf( "Created desktop object: %x", wpDesktop);
     107    WPFolder_tstSetFullPath(wpDesktop, desktopDir, NULLHANDLE);
    105108
    106     WPFolder_wpPopulate(wpDesktop, 0, desktopDir, 0, NULL);
     109    WPFolder_wpOpen(wpDesktop, NULL, OPEN_DEFAULT,  NULL, NULL);
    107110    /*    WPFolder_wpPopulate(wpObject, 0,"blabla 2", 0,  NULL);  */
    108111
Note: See TracChangeset for help on using the changeset viewer.