diff options
author | George Hazan <ghazan@miranda.im> | 2022-05-10 17:41:39 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2022-05-10 17:41:39 +0300 |
commit | 581403e558ce86fbe7fb16963b57dabe4a8552a2 (patch) | |
tree | bfcec12ce2992f52597768e50e4e8384853a9dc5 /src/mir_core | |
parent | 940717baac9f354399003342e19985ef8dc7c3eb (diff) |
basic interface classes
Diffstat (limited to 'src/mir_core')
-rw-r--r-- | src/mir_core/mir_core.mk | 187 | ||||
-rw-r--r-- | src/mir_core/mir_core.project | 7 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CCtrlButton.cpp | 15 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CCtrlCheck.cpp | 8 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CCtrlCombo.cpp | 78 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CCtrlEdit.cpp | 16 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CCtrlLabel.cpp | 1 | ||||
-rw-r--r-- | src/mir_core/src/Linux/CTimer.cpp | 11 |
8 files changed, 177 insertions, 146 deletions
diff --git a/src/mir_core/mir_core.mk b/src/mir_core/mir_core.mk index f6186ffec1..0e7221d564 100644 --- a/src/mir_core/mir_core.mk +++ b/src/mir_core/mir_core.mk @@ -62,9 +62,9 @@ AS := as ## User defined environment variables ## CodeLiteDir:=/usr/share/codelite -Objects0=$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) +Objects0=$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) @@ -96,110 +96,145 @@ PreBuild: ## ## Objects ## -$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix): src/Linux/CDbLink.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDbLink.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix): src/Linux/CDbLink.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix) src/Linux/CDbLink.cpp +$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix): src/Linux/CTimer.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CTimer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix): src/Linux/CTimer.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix) src/Linux/CTimer.cpp -$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix): src/binbuffer.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/binbuffer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix): src/binbuffer.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix) src/binbuffer.cpp +$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix): src/Linux/CCtrlEdit.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlEdit.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix): src/Linux/CCtrlEdit.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix) src/Linux/CCtrlEdit.cpp -$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix): src/bitmaps.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/bitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_bitmaps.cpp$(PreprocessSuffix): src/bitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_bitmaps.cpp$(PreprocessSuffix) src/bitmaps.cpp +$(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix): src/Linux/CCtrlCheck.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlCheck.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(PreprocessSuffix): src/Linux/CCtrlCheck.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(PreprocessSuffix) src/Linux/CCtrlCheck.cpp -$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix): src/lists.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/lists.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_lists.cpp$(PreprocessSuffix): src/lists.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_lists.cpp$(PreprocessSuffix) src/lists.cpp +$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix): src/logger.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/logger.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_logger.cpp$(PreprocessSuffix): src/logger.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_logger.cpp$(PreprocessSuffix) src/logger.cpp -$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix): src/Linux/fileutil.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/fileutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_Linux_fileutil.cpp$(PreprocessSuffix): src/Linux/fileutil.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(PreprocessSuffix) src/Linux/fileutil.cpp +$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix): src/md5.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/md5.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_md5.cpp$(PreprocessSuffix): src/md5.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_md5.cpp$(PreprocessSuffix) src/md5.cpp -$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix): src/Linux/CCtrlBase.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(PreprocessSuffix): src/Linux/CCtrlBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(PreprocessSuffix) src/Linux/CCtrlBase.cpp +$(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix): src/mstring.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/mstring.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_mstring.cpp$(PreprocessSuffix): src/mstring.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_mstring.cpp$(PreprocessSuffix) src/mstring.cpp -$(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix): src/memory.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/memory.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix): src/memory.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix) src/memory.cpp +$(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(ObjectSuffix): src/Linux/CCtrlCombo.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlCombo.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(PreprocessSuffix): src/Linux/CCtrlCombo.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(PreprocessSuffix) src/Linux/CCtrlCombo.cpp -$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix): src/utils.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_utils.cpp$(PreprocessSuffix): src/utils.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_utils.cpp$(PreprocessSuffix) src/utils.cpp +$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix): src/sha1.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/sha1.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_sha1.cpp$(PreprocessSuffix): src/sha1.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_sha1.cpp$(PreprocessSuffix) src/sha1.cpp -$(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix): src/Linux/strutil.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/strutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_Linux_strutil.cpp$(PreprocessSuffix): src/Linux/strutil.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_strutil.cpp$(PreprocessSuffix) src/Linux/strutil.cpp +$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix): src/db.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/db.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix): src/db.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix) src/db.cpp -$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix): src/tinyxml2_utils.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/tinyxml2_utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(PreprocessSuffix): src/tinyxml2_utils.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(PreprocessSuffix) src/tinyxml2_utils.cpp +$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix): src/Linux/CCtrlLabel.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlLabel.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix): src/Linux/CCtrlLabel.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix) src/Linux/CCtrlLabel.cpp -$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix): src/Linux/CDlgBase.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDlgBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix): src/Linux/CDlgBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix) src/Linux/CDlgBase.cpp +$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix): src/http.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix): src/http.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix) src/http.cpp -$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix): src/utf.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/utf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_utf.cpp$(PreprocessSuffix): src/utf.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_utf.cpp$(PreprocessSuffix) src/utf.cpp +$(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix): src/Linux/CCtrlData.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(PreprocessSuffix): src/Linux/CCtrlData.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(PreprocessSuffix) src/Linux/CCtrlData.cpp $(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix): src/tinyxml2.cpp $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/tinyxml2.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/src_tinyxml2.cpp$(PreprocessSuffix): src/tinyxml2.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_tinyxml2.cpp$(PreprocessSuffix) src/tinyxml2.cpp -$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix): src/http.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix): src/http.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix) src/http.cpp - $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx +$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix): src/Linux/CDlgBase.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDlgBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix): src/Linux/CDlgBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix) src/Linux/CDlgBase.cpp + +$(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix): src/Linux/CCtrlButton.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlButton.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(PreprocessSuffix): src/Linux/CCtrlButton.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(PreprocessSuffix) src/Linux/CCtrlButton.cpp + +$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix): src/tinyxml2_utils.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/tinyxml2_utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(PreprocessSuffix): src/tinyxml2_utils.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(PreprocessSuffix) src/tinyxml2_utils.cpp + +$(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix): src/Linux/strutil.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/strutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_strutil.cpp$(PreprocessSuffix): src/Linux/strutil.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_strutil.cpp$(PreprocessSuffix) src/Linux/strutil.cpp + $(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix): src/sha256.cpp $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/sha256.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/src_sha256.cpp$(PreprocessSuffix): src/sha256.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_sha256.cpp$(PreprocessSuffix) src/sha256.cpp -$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix): src/db.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/db.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix): src/db.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix) src/db.cpp +$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix): src/utf.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/utf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_utf.cpp$(PreprocessSuffix): src/utf.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_utf.cpp$(PreprocessSuffix) src/utf.cpp -$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix): src/sha1.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/sha1.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_sha1.cpp$(PreprocessSuffix): src/sha1.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_sha1.cpp$(PreprocessSuffix) src/sha1.cpp +$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix): src/utils.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_utils.cpp$(PreprocessSuffix): src/utils.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_utils.cpp$(PreprocessSuffix) src/utils.cpp -$(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix): src/mstring.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/mstring.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_mstring.cpp$(PreprocessSuffix): src/mstring.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_mstring.cpp$(PreprocessSuffix) src/mstring.cpp +$(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix): src/memory.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/memory.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix): src/memory.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix) src/memory.cpp -$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix): src/md5.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/md5.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_md5.cpp$(PreprocessSuffix): src/md5.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_md5.cpp$(PreprocessSuffix) src/md5.cpp +$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix): src/Linux/fileutil.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/fileutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_fileutil.cpp$(PreprocessSuffix): src/Linux/fileutil.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(PreprocessSuffix) src/Linux/fileutil.cpp -$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix): src/logger.cpp - $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/logger.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_logger.cpp$(PreprocessSuffix): src/logger.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_logger.cpp$(PreprocessSuffix) src/logger.cpp +$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix): src/lists.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/lists.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_lists.cpp$(PreprocessSuffix): src/lists.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_lists.cpp$(PreprocessSuffix) src/lists.cpp + +$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix): src/bitmaps.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/bitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_bitmaps.cpp$(PreprocessSuffix): src/bitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_bitmaps.cpp$(PreprocessSuffix) src/bitmaps.cpp + +$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix): src/binbuffer.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/binbuffer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix): src/binbuffer.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix) src/binbuffer.cpp + +$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix): src/Linux/CCtrlBase.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(PreprocessSuffix): src/Linux/CCtrlBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(PreprocessSuffix) src/Linux/CCtrlBase.cpp + +$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix): src/Linux/CDbLink.cpp + $(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDbLink.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix): src/Linux/CDbLink.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix) src/Linux/CDbLink.cpp ## ## Clean diff --git a/src/mir_core/mir_core.project b/src/mir_core/mir_core.project index 4a24b8ce91..92d6d205f6 100644 --- a/src/mir_core/mir_core.project +++ b/src/mir_core/mir_core.project @@ -4,6 +4,13 @@ <Dependencies/> <VirtualDirectory Name="src"> <VirtualDirectory Name="UI"> + <File Name="src/Linux/CTimer.cpp"/> + <File Name="src/Linux/CCtrlLabel.cpp"/> + <File Name="src/Linux/CCtrlEdit.cpp"/> + <File Name="src/Linux/CCtrlData.cpp"/> + <File Name="src/Linux/CCtrlCombo.cpp"/> + <File Name="src/Linux/CCtrlCheck.cpp"/> + <File Name="src/Linux/CCtrlButton.cpp"/> <File Name="src/Linux/CDlgBase.cpp"/> <File Name="src/Linux/CDbLink.cpp"/> <File Name="src/Linux/CCtrlBase.cpp"/> diff --git a/src/mir_core/src/Linux/CCtrlButton.cpp b/src/mir_core/src/Linux/CCtrlButton.cpp index bf84cad74f..1fb547bef8 100644 --- a/src/mir_core/src/Linux/CCtrlButton.cpp +++ b/src/mir_core/src/Linux/CCtrlButton.cpp @@ -31,24 +31,25 @@ CCtrlButton::CCtrlButton(CDlgBase* wnd, int idCtrl) BOOL CCtrlButton::OnCommand(HWND, uint16_t, uint16_t idCode) { - if (idCode == BN_CLICKED) - OnClick(this); + // if (idCode == BN_CLICKED) + // OnClick(this); return FALSE; } void CCtrlButton::Click() { - if (Enabled()) - ::SendMessage(m_parentWnd->GetHwnd(), WM_COMMAND, MAKELONG(m_idCtrl, BN_CLICKED), 0); + // if (Enabled()) + // ::SendMessage(m_parentWnd->GetHwnd(), WM_COMMAND, MAKELONG(m_idCtrl, BN_CLICKED), 0); } bool CCtrlButton::IsPushed() const { - return ::SendMessage(m_hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED; + // return ::SendMessage(m_hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED; + return false; } void CCtrlButton::Push(bool bPushed) { - if (Enabled()) - ::SendMessage(m_hwnd, BM_SETCHECK, (bPushed) ? BST_CHECKED : BST_UNCHECKED, 0); + // if (Enabled()) + // ::SendMessage(m_hwnd, BM_SETCHECK, (bPushed) ? BST_CHECKED : BST_UNCHECKED, 0); } diff --git a/src/mir_core/src/Linux/CCtrlCheck.cpp b/src/mir_core/src/Linux/CCtrlCheck.cpp index 9c1281e8b8..15c9ab0f1b 100644 --- a/src/mir_core/src/Linux/CCtrlCheck.cpp +++ b/src/mir_core/src/Linux/CCtrlCheck.cpp @@ -54,15 +54,17 @@ void CCtrlCheck::OnReset() int CCtrlCheck::GetState() const { - return ::SendMessage(m_hwnd, BM_GETCHECK, 0, 0); + // return ::SendMessage(m_hwnd, BM_GETCHECK, 0, 0); + return false; } void CCtrlCheck::SetState(int state) { - ::SendMessage(m_hwnd, BM_SETCHECK, state, 0); + // ::SendMessage(m_hwnd, BM_SETCHECK, state, 0); } bool CCtrlCheck::IsChecked() { - return GetState() == BST_CHECKED; + // return GetState() == BST_CHECKED; + return false; } diff --git a/src/mir_core/src/Linux/CCtrlCombo.cpp b/src/mir_core/src/Linux/CCtrlCombo.cpp index 83cd721494..905ebc7a24 100644 --- a/src/mir_core/src/Linux/CCtrlCombo.cpp +++ b/src/mir_core/src/Linux/CCtrlCombo.cpp @@ -32,15 +32,15 @@ CCtrlCombo::CCtrlCombo(CDlgBase *dlg, int ctrlId) BOOL CCtrlCombo::OnCommand(HWND, uint16_t, uint16_t idCode) { switch (idCode) { - case CBN_CLOSEUP: OnCloseup(this); break; - case CBN_DROPDOWN: OnDropdown(this); break; - case CBN_SELCHANGE: OnSelChanged(this); break; - case CBN_KILLFOCUS: OnKillFocus(this); break; - - case CBN_EDITCHANGE: - case CBN_EDITUPDATE: - case CBN_SELENDOK: - NotifyChange(); + // case CBN_CLOSEUP: OnCloseup(this); break; + // case CBN_DROPDOWN: OnDropdown(this); break; + // case CBN_SELCHANGE: OnSelChanged(this); break; + // case CBN_KILLFOCUS: OnKillFocus(this); break; + + // case CBN_EDITCHANGE: + // case CBN_EDITUPDATE: + // case CBN_SELENDOK: + // NotifyChange(); break; } return TRUE; @@ -57,13 +57,13 @@ bool CCtrlCombo::OnApply() CSuper::OnApply(); if (GetDataType() == DBVT_WCHAR) { - int len = GetWindowTextLength(m_hwnd) + 1; - wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len); - GetWindowText(m_hwnd, buf, len); - SaveText(buf); + // int len = GetWindowTextLength(m_hwnd) + 1; + // wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len); + // GetWindowText(m_hwnd, buf, len); + // SaveText(buf); } else if (GetDataType() != DBVT_DELETED) { - SaveInt(GetInt()); + SaveInt(GetInt()); } return true; } @@ -100,86 +100,70 @@ int CCtrlCombo::SelectData(LPARAM data) int CCtrlCombo::AddString(const wchar_t *text, LPARAM data) { - int iItem = SendMessage(m_hwnd, CB_ADDSTRING, 0, (LPARAM)text); - if (data) - SendMessage(m_hwnd, CB_SETITEMDATA, iItem, data); - return iItem; + return -1; } int CCtrlCombo::AddStringA(const char *text, LPARAM data) { - int iItem = SendMessageA(m_hwnd, CB_ADDSTRING, 0, (LPARAM)text); - if (data) - SendMessage(m_hwnd, CB_SETITEMDATA, iItem, data); - return iItem; + return -1; } void CCtrlCombo::DeleteString(int index) -{ SendMessage(m_hwnd, CB_DELETESTRING, index, 0); +{ } int CCtrlCombo::FindString(const wchar_t *str, int index, bool exact) -{ return SendMessage(m_hwnd, exact?CB_FINDSTRINGEXACT:CB_FINDSTRING, index, (LPARAM)str); +{ return 0; } int CCtrlCombo::FindStringA(const char *str, int index, bool exact) -{ return SendMessageA(m_hwnd, exact?CB_FINDSTRINGEXACT:CB_FINDSTRING, index, (LPARAM)str); +{ return 0; } int CCtrlCombo::GetCount() const -{ return SendMessage(m_hwnd, CB_GETCOUNT, 0, 0); +{ return 0; } int CCtrlCombo::GetCurSel() const -{ return SendMessage(m_hwnd, CB_GETCURSEL, 0, 0); +{ return 0; } bool CCtrlCombo::GetDroppedState() const -{ return SendMessage(m_hwnd, CB_GETDROPPEDSTATE, 0, 0) ? true : false; +{ return 0; } LPARAM CCtrlCombo::GetItemData(int index) const -{ return SendMessage(m_hwnd, CB_GETITEMDATA, index, 0); +{ return 0; } wchar_t* CCtrlCombo::GetItemText(int index) const -{ - wchar_t *result = (wchar_t *)mir_alloc(sizeof(wchar_t) * (SendMessage(m_hwnd, CB_GETLBTEXTLEN, index, 0) + 1)); - SendMessage(m_hwnd, CB_GETLBTEXT, index, (LPARAM)result); - return result; +{ return 0; } wchar_t* CCtrlCombo::GetItemText(int index, wchar_t *buf, int size) const -{ - wchar_t *result = (wchar_t *)_alloca(sizeof(wchar_t) * (SendMessage(m_hwnd, CB_GETLBTEXTLEN, index, 0) + 1)); - SendMessage(m_hwnd, CB_GETLBTEXT, index, (LPARAM)result); - mir_wstrncpy(buf, result, size); - return buf; +{ return 0; } int CCtrlCombo::InsertString(const wchar_t *text, int pos, LPARAM data) -{ - int iItem = SendMessage(m_hwnd, CB_INSERTSTRING, pos, (LPARAM)text); - SendMessage(m_hwnd, CB_SETITEMDATA, iItem, data); - return iItem; +{ return 0; } void CCtrlCombo::ResetContent() -{ SendMessage(m_hwnd, CB_RESETCONTENT, 0, 0); +{ } int CCtrlCombo::SelectString(const wchar_t *str) -{ return SendMessage(m_hwnd, CB_SELECTSTRING, 0, (LPARAM)str); +{ return 0; } int CCtrlCombo::SetCurSel(int index) -{ return SendMessage(m_hwnd, CB_SETCURSEL, index, 0); +{ return 0; } void CCtrlCombo::SetItemData(int index, LPARAM data) -{ SendMessage(m_hwnd, CB_SETITEMDATA, index, data); +{ } void CCtrlCombo::ShowDropdown(bool show) -{ SendMessage(m_hwnd, CB_SHOWDROPDOWN, show ? TRUE : FALSE, 0); +{ } diff --git a/src/mir_core/src/Linux/CCtrlEdit.cpp b/src/mir_core/src/Linux/CCtrlEdit.cpp index f035b5b14a..b2b5e14d46 100644 --- a/src/mir_core/src/Linux/CCtrlEdit.cpp +++ b/src/mir_core/src/Linux/CCtrlEdit.cpp @@ -31,8 +31,8 @@ CCtrlEdit::CCtrlEdit(CDlgBase *dlg, int ctrlId) BOOL CCtrlEdit::OnCommand(HWND, uint16_t, uint16_t idCode) { - if (idCode == EN_CHANGE) - NotifyChange(); + // if (idCode == EN_CHANGE) + // NotifyChange(); return TRUE; } @@ -41,10 +41,10 @@ bool CCtrlEdit::OnApply() CSuper::OnApply(); if (GetDataType() == DBVT_WCHAR) { - int len = GetWindowTextLength(m_hwnd) + 1; - wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len); - GetWindowText(m_hwnd, buf, len); - SaveText(buf); + // int len = GetWindowTextLength(m_hwnd) + 1; + // wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len); + // GetWindowText(m_hwnd, buf, len); + // SaveText(buf); } else if (GetDataType() != DBVT_DELETED) { SaveInt(GetInt()); @@ -54,7 +54,7 @@ bool CCtrlEdit::OnApply() void CCtrlEdit::OnReset() { - m_bSilent = (GetWindowLong(m_hwnd, GWL_STYLE) & ES_READONLY) != 0; + // m_bSilent = (GetWindowLong(m_hwnd, GWL_STYLE) & ES_READONLY) != 0; if (GetDataType() == DBVT_WCHAR) SetText(LoadText()); @@ -64,5 +64,5 @@ void CCtrlEdit::OnReset() void CCtrlEdit::SetMaxLength(unsigned int len) { - SendMsg(EM_SETLIMITTEXT, len, 0); + // SendMsg(EM_SETLIMITTEXT, len, 0); } diff --git a/src/mir_core/src/Linux/CCtrlLabel.cpp b/src/mir_core/src/Linux/CCtrlLabel.cpp index fd460fdf8b..0c097c0655 100644 --- a/src/mir_core/src/Linux/CCtrlLabel.cpp +++ b/src/mir_core/src/Linux/CCtrlLabel.cpp @@ -28,4 +28,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. CCtrlLabel::CCtrlLabel(CDlgBase* wnd, int idCtrl) : CCtrlBase(wnd, idCtrl) {} - diff --git a/src/mir_core/src/Linux/CTimer.cpp b/src/mir_core/src/Linux/CTimer.cpp index b346138707..5d3c8b01b1 100644 --- a/src/mir_core/src/Linux/CTimer.cpp +++ b/src/mir_core/src/Linux/CTimer.cpp @@ -48,12 +48,13 @@ BOOL CTimer::OnTimer() void CTimer::Start(int elapse) { - ::SetTimer(m_wnd->GetHwnd(), m_idEvent, elapse, nullptr); + // ::SetTimer(m_wnd->GetHwnd(), m_idEvent, elapse, nullptr); } bool CTimer::Stop() { - return 0 != ::KillTimer(m_wnd->GetHwnd(), m_idEvent); + // return 0 != ::KillTimer(m_wnd->GetHwnd(), m_idEvent); + return false; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -67,7 +68,8 @@ struct TStartParam static INT_PTR CALLBACK stubStart(void *param) { auto *p = (TStartParam *)param; - return ::SetTimer(p->pTimer->GetHwnd(), p->pTimer->GetEventId(), p->period, nullptr); + // return ::SetTimer(p->pTimer->GetHwnd(), p->pTimer->GetEventId(), p->period, nullptr); + return 0; } void CTimer::StartSafe(int elapse) @@ -81,7 +83,8 @@ void CTimer::StartSafe(int elapse) static INT_PTR CALLBACK stubStop(void *param) { auto *p = (CTimer*)param; - return ::KillTimer(p->GetHwnd(), p->GetEventId()); + // return ::KillTimer(p->GetHwnd(), p->GetEventId()); + return 0; } void CTimer::StopSafe() |