← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/audacity/gutsy-backports

« back to all changes in this revision

Viewing changes to src/MacroMagic.h

  • Committer: Bazaar Package Importer
  • Author(s): John Dong
  • Date: 2008-02-18 21:58:19 UTC
  • mfrom: (13.1.2 hardy)
  • Revision ID: james.westby@ubuntu.com-20080218215819-tmbcf1rx238r8gdv
Tags: 1.3.4-1.1ubuntu1~gutsy1
Automated backport upload; no source changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/MacroMagic.h
41
41
 
42
42
#ifdef THEME_INITS
43
43
#define DEFINE_IMAGE( name, initialiser, textual_name ) \
44
 
   RegisterImage( name, initialiser, textual_name );
 
44
   theTheme.RegisterImage( name, initialiser, textual_name );
45
45
#define DEFINE_COLOUR( name, initialiser, textual_name )\
46
 
   RegisterColour( name, initialiser, textual_name );
 
46
   theTheme.RegisterColour( name, initialiser, textual_name );
47
47
#define DEFINE_FONT( name, initialiser, textual_name )  \
48
 
   RegisterFont( name, initialiser, textual_name );
49
 
#define SET_THEME_FLAGS( flags ) mFlow.mFlags = flags;
 
48
   theTheme.RegisterFont( name, initialiser, textual_name );
 
49
#define SET_THEME_FLAGS( flags ) theTheme.SetFlags(  flags );
50
50
#undef THEME_DECLARATIONS
51
51
#undef THEME_EXTERNS
52
52
#endif
53
53
 
54
54
#ifdef THEME_DECLARATIONS
55
 
#define DEFINE_IMAGE( name, initialiser, textual_name )  teBmps name=-1;
56
 
#define DEFINE_COLOUR( name, initialiser, textual_name )  int name=-1;
57
 
#define DEFINE_FONT( name, initialiser, textual_name )  int name=-1;
 
55
#define DEFINE_IMAGE( name, initialiser, textual_name )  AUDACITY_DLL_API teBmps name=-1;
 
56
#define DEFINE_COLOUR( name, initialiser, textual_name ) AUDACITY_DLL_API int name=-1;
 
57
#define DEFINE_FONT( name, initialiser, textual_name )  AUDACITY_DLL_API int name=-1;
58
58
#define SET_THEME_FLAGS( flags )
59
59
#undef THEME_INITS
60
60
#undef THEME_EXTERNS
61
61
#endif
62
62
 
63
63
#ifdef THEME_EXTERNS
64
 
#define DEFINE_IMAGE( name, initialiser, textual_name )  extern teBmps name;
65
 
#define DEFINE_COLOUR( name, initialiser, textual_name ) extern int name;
66
 
#define DEFINE_FONT( name, initialiser, textual_name ) extern int name;
 
64
#define DEFINE_IMAGE( name, initialiser, textual_name )  extern AUDACITY_DLL_API teBmps name;
 
65
#define DEFINE_COLOUR( name, initialiser, textual_name ) extern AUDACITY_DLL_API int name;
 
66
#define DEFINE_FONT( name, initialiser, textual_name ) extern AUDACITY_DLL_API int name;
67
67
#define SET_THEME_FLAGS( flags )
68
68
#endif