diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-27 14:57:16 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-27 14:57:16 +0000 |
| commit | 3d3cc79acb3e2ee96774fdbdd5a6f108a6709dd4 (patch) | |
| tree | 8a8a302f001daaeca65b33142672b0f1b776512d | |
| parent | 99e2492fac8ed5f121e364982a2a4487009a6b84 (diff) | |
Fix some issues with BUILD_VER_STRING on About dialog
| -rw-r--r-- | cui/source/dialogs/about.cxx | 10 | ||||
| -rw-r--r-- | cui/source/dialogs/makefile.mk | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index e578b14b65e9..4f1020d63ee3 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -231,7 +231,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) : aBuildData.SetFont( aNewFont ); aBuildData.SetBackground( aWall ); #ifdef BUILD_VER_STRING - String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) ); +#define _STRINGIFY(x) #x +#define STRINGIFY(x) _STRINGIFY(x) + String aBuildString( DEFINE_CONST_UNICODE( STRINGIFY( BUILD_VER_STRING ) ) ); #else String aBuildString; #endif @@ -251,7 +253,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) : aCopyrightText.SetText( aCopyrightTextStr ); + // layout fixed text controls layoutText( aVersionText, nY, nTextWidth, a6Size ); + if( aBuildString.Len() > 0 ) + { + nY += ( a6Size.Height() / 2 ); + layoutText( aBuildData, nY, nTextWidth, a6Size ); + } nY += nCtrlMargin; // OK-Button-Position (at the bottom and centered) diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk index 67bc5962cc10..0c7ce1b7278a 100644 --- a/cui/source/dialogs/makefile.mk +++ b/cui/source/dialogs/makefile.mk @@ -38,6 +38,10 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc .ENDIF # ENABLE_LAYOUT == TRUE +.IF "$(BUILD_VER_STRING)" != "" +CFLAGS+= -DBUILD_VER_STRING="$(BUILD_VER_STRING)" +.ENDIF + # --- Files -------------------------------------------------------- SRS1NAME=dialogs |