Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:02:30 Modified: dba/dbaccess/source/ui/inc/FieldControls.hxx
Log: RESYNC: (1.5-1.6); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: FieldControls.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/FieldControls.hxx?r1=1.5.8.3&r2=1.5.8.4 Delta lines: +21 -27 --------------------- --- FieldControls.hxx 25 Apr 2006 13:03:03 -0000 1.5.8.3 +++ FieldControls.hxx 4 Jul 2006 08:02:28 -0000 1.5.8.4 @@ -54,22 +54,19 @@ namespace dbaui { - class OSpecialReadOnly + namespace { - protected: - void SetSpecialReadOnly(BOOL _bReadOnly,Window *pWin) + void lcl_setSpecialReadOnly( BOOL _bReadOnly, Window* _pWin ) { StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); - pWin->SetBackground(Wallpaper(rNewColor)); - pWin->SetControlBackground(rNewColor); + _pWin->SetBackground(Wallpaper(rNewColor)); + _pWin->SetControlBackground(rNewColor); } - public: - virtual void SetSpecialReadOnly(BOOL _bReadOnly) = 0; - }; + } + //================================================================== class OPropColumnEditCtrl : public OSQLNameEdit - ,public OSpecialReadOnly { OModuleClient m_aModuleClient; short m_nPos; @@ -77,7 +74,7 @@ public: inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -85,7 +82,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, @@ -100,7 +97,6 @@ } //================================================================== class OPropEditCtrl : public Edit - ,public OSpecialReadOnly { OModuleClient m_aModuleClient; short m_nPos; @@ -110,7 +106,7 @@ inline OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -118,7 +114,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; @@ -137,7 +133,6 @@ //================================================================== class OPropNumericEditCtrl : public NumericField - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; @@ -146,7 +141,7 @@ inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -154,7 +149,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; @@ -173,7 +168,6 @@ //================================================================== class OPropListBoxCtrl : public ListBox - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; @@ -182,7 +176,7 @@ inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetSelectEntryPos() != GetSavedValue(); } + inline BOOL IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -190,7 +184,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
