[paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.8,1.3.6.9 paraconfig_macos.h,1.1.2.1,1.1.2.2 paraconfig_win32.h,1.1.1.1.6.2,1.1.1.1.6.3 pgfilearchive.h,1.3.6.1,1.3.6.2 pglayout.h,1.3,1.3.6.1

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv3107/include

Modified Files:
      Tag: devel-1-0
        paraconfig.h paraconfig_macos.h paraconfig_win32.h 
        pgfilearchive.h pglayout.h 
Log Message:
- added pattern matching for PG_FileArchive::GetFileList
- added fnmatch replacement
- fix framebuffer console font rendering
- added DECLSPEC to PG_LAyout functions



Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.3.6.8
retrieving revision 1.3.6.9
diff -C2 -r1.3.6.8 -r1.3.6.9
*** paraconfig.h        3 Jun 2002 08:27:17 -0000       1.3.6.8
--- paraconfig.h        6 Jun 2002 22:10:46 -0000       1.3.6.9
***************
*** 149,151 ****
--- 149,169 ----
  #endif
  
+ // Replacement for fnmatch
+ #ifndef HAVE_FNMATCH
+ extern "C" {
+ /* Bits set in the FLAGS argument to `fnmatch'.  */
+ #define       FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
+ #define       FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special 
chars.  */
+ #define       FNM_PERIOD      (1 << 2) /* Leading `.' is matched only 
explicitly.  */
+ #define       __FNM_FLAGS     (FNM_PATHNAME|FNM_NOESCAPE|FNM_PERIOD)
+ 
+ /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
+ #define       FNM_NOMATCH     1
+ 
+ int fnmatch((const char *, const char *, int));
+ }
+ #else
+ #include <fnmatch.h>
+ #endif
+ 
  #endif // CONFIG_INCLUDED

Index: paraconfig_macos.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Attic/paraconfig_macos.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** paraconfig_macos.h  31 May 2002 12:57:16 -0000      1.1.2.1
--- paraconfig_macos.h  6 Jun 2002 22:10:46 -0000       1.1.2.2
***************
*** 17,20 ****
--- 17,23 ----
  /* #undef MPATROL_ENABLED */
  
+ /* Define if you have the fnmatch function.  */
+ /* #undef HAVE_FNMATCH */
+ 
  /* Define if you have the strdup function.  */
  /* #undef HAVE_STRDUP */

Index: paraconfig_win32.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig_win32.h,v
retrieving revision 1.1.1.1.6.2
retrieving revision 1.1.1.1.6.3
diff -C2 -r1.1.1.1.6.2 -r1.1.1.1.6.3
*** paraconfig_win32.h  31 May 2002 12:57:16 -0000      1.1.1.1.6.2
--- paraconfig_win32.h  6 Jun 2002 22:10:46 -0000       1.1.1.1.6.3
***************
*** 18,21 ****
--- 18,24 ----
  #define PARAGUI_THEMEDIR "./data"
  
+ /* Define if you have the fnmatch function.  */
+ /* #undef HAVE_FNMATCH */
+ 
  /* Define if you have the strdup function.  */
  #define HAVE_STRDUP 1

Index: pgfilearchive.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfilearchive.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgfilearchive.h     28 May 2002 09:41:44 -0000      1.3.6.1
--- pgfilearchive.h     6 Jun 2002 22:10:46 -0000       1.3.6.2
***************
*** 290,296 ****
        \note The caller owns the returned vector and is responsible for 
deleting the returned structure.
        \param dir directory to list files in
        \return the file list
        */
!       static PG_FileList* GetFileList(const char *dir);
        
  private:
--- 290,297 ----
        \note The caller owns the returned vector and is responsible for 
deleting the returned structure.
        \param dir directory to list files in
+       \param wildcard wildcard for file pattern matching
        \return the file list
        */
!       static PG_FileList* GetFileList(const char *dir, const char* 
wildcard="*");
        
  private:

Index: pglayout.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglayout.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pglayout.h  15 Apr 2002 13:35:35 -0000      1.3
--- pglayout.h  6 Jun 2002 22:10:46 -0000       1.3.6.1
***************
*** 52,61 ****
  DECLSPEC bool Load(PG_Widget* parent, const char *filename, void (* 
WorkCallback)(int now, int max), void *UserSpace);
  
! int GetParamInt(const char **Source, char *What);
! char* GetParamStr(const char **Source, char *What);
! void GetParamRect(const char **Source, char *What, PG_Rect& Rect, PG_Widget* 
parent = NULL);
! int GetParamAlign(const char **Source, char *What);
! int GetParamIMode(const char **Source, char *What);
! int GetParamGrad(const char **Source, char *What, PG_Gradient *grad);
  
  };
--- 52,61 ----
  DECLSPEC bool Load(PG_Widget* parent, const char *filename, void (* 
WorkCallback)(int now, int max), void *UserSpace);
  
! int DECLSPEC GetParamInt(const char **Source, char *What);
! char* DECLSPEC GetParamStr(const char **Source, char *What);
! void DECLSPEC GetParamRect(const char **Source, char *What, PG_Rect& Rect, 
PG_Widget* parent = NULL);
! int DECLSPEC GetParamAlign(const char **Source, char *What);
! int DECLSPEC GetParamIMode(const char **Source, char *What);
! int DECLSPEC GetParamGrad(const char **Source, char *What, PG_Gradient *grad);
  
  };