This commit is contained in:
2024-08-16 13:56:54 -04:00
parent 75df00b3e3
commit 2e364ff470
19 changed files with 211 additions and 125 deletions

View File

@@ -2,7 +2,7 @@
WORD VectorHandler::insertHandler(HandlerType handlerType,PureCallback *lpCallback,CallOrder callOrder)
{
WORD returnCode;
WORD returnCode(0);
switch(handlerType)
{
@@ -412,7 +412,7 @@ CallbackData::ReturnType VectorHandler::callHandler(Block<CallbackPointer> &some
CallbackData::ReturnType returnCode(0);
CallbackData::ReturnType callReturn;
for(int vectorIndex=0;vectorIndex<size;vectorIndex++)
for(int vectorIndex=0;vectorIndex<(int)size;vectorIndex++)
{
if(FALSE!=(callReturn=someCallbackVector[vectorIndex].callback(someCallbackData)))returnCode=callReturn;
size=(size_t)someCallbackVector.size();
@@ -422,199 +422,200 @@ CallbackData::ReturnType VectorHandler::callHandler(Block<CallbackPointer> &some
void VectorHandler::removeHandler(HandlerType handlerType,PureCallback *lpCallback)
{
CallbackPointer callbackPointer(lpCallback);
switch(handlerType)
{
case ChangeCBChainHandler :
removeHandler(mChangeCBChainVector,CallbackPointer(lpCallback));
removeHandler(mChangeCBChainVector,callbackPointer);
break;
case DrawClipboardHandler :
removeHandler(mDrawClipboardVector,CallbackPointer(lpCallback));
removeHandler(mDrawClipboardVector,callbackPointer);
break;
case UserHandler :
removeHandler(mUserVector,CallbackPointer(lpCallback));
removeHandler(mUserVector,callbackPointer);
break;
case NCCreateHandler :
removeHandler(mNCCreateVector,CallbackPointer(lpCallback));
removeHandler(mNCCreateVector,callbackPointer);
break;
case CreateHandler :
removeHandler(mCreateVector,CallbackPointer(lpCallback));
removeHandler(mCreateVector,callbackPointer);
break;
case InitDialogHandler :
removeHandler(mInitDialogVector,CallbackPointer(lpCallback));
removeHandler(mInitDialogVector,callbackPointer);
break;
case SetFontHandler :
removeHandler(mSetFontVector,CallbackPointer(lpCallback));
removeHandler(mSetFontVector,callbackPointer);
break;
case TimerHandler :
removeHandler(mTimerVector,CallbackPointer(lpCallback));
removeHandler(mTimerVector,callbackPointer);
break;
case CharHandler :
removeHandler(mCharVector,CallbackPointer(lpCallback));
removeHandler(mCharVector,callbackPointer);
break;
case SizeHandler :
removeHandler(mSizeVector,CallbackPointer(lpCallback));
removeHandler(mSizeVector,callbackPointer);
break;
case CompactingHandler :
removeHandler(mCompactingVector,CallbackPointer(lpCallback));
removeHandler(mCompactingVector,callbackPointer);
break;
case WinIniChangeHandler :
removeHandler(mWinIniChangeVector,CallbackPointer(lpCallback));
removeHandler(mWinIniChangeVector,callbackPointer);
break;
case SysColorChangeHandler :
removeHandler(mSysColorChangeVector,CallbackPointer(lpCallback));
removeHandler(mSysColorChangeVector,callbackPointer);
break;
case LeftButtonDoubleHandler :
removeHandler(mLeftButtonDoubleVector,CallbackPointer(lpCallback));
removeHandler(mLeftButtonDoubleVector,callbackPointer);
break;
case LeftButtonDownHandler :
removeHandler(mLeftButtonDownVector,CallbackPointer(lpCallback));
removeHandler(mLeftButtonDownVector,callbackPointer);
break;
case LeftButtonUpHandler :
removeHandler(mLeftButtonUpVector,CallbackPointer(lpCallback));
removeHandler(mLeftButtonUpVector,callbackPointer);
break;
case RightButtonDoubleHandler :
removeHandler(mRightButtonDoubleVector,CallbackPointer(lpCallback));
removeHandler(mRightButtonDoubleVector,callbackPointer);
break;
case RightButtonDownHandler :
removeHandler(mRightButtonDownVector,CallbackPointer(lpCallback));
removeHandler(mRightButtonDownVector,callbackPointer);
break;
case RightButtonUpHandler :
removeHandler(mRightButtonUpVector,CallbackPointer(lpCallback));
removeHandler(mRightButtonUpVector,callbackPointer);
break;
case NCLeftButtonDownHandler :
removeHandler(mNCLeftButtonDownVector,CallbackPointer(lpCallback));
removeHandler(mNCLeftButtonDownVector,callbackPointer);
break;
case NCLeftButtonUpHandler :
removeHandler(mNCLeftButtonUpVector,CallbackPointer(lpCallback));
removeHandler(mNCLeftButtonUpVector,callbackPointer);
break;
case NCRightButtonDownHandler :
removeHandler(mNCRightButtonDownVector,CallbackPointer(lpCallback));
removeHandler(mNCRightButtonDownVector,callbackPointer);
break;
case NCRightButtonUpHandler :
removeHandler(mNCRightButtonUpVector,CallbackPointer(lpCallback));
removeHandler(mNCRightButtonUpVector,callbackPointer);
break;
case PaintHandler :
removeHandler(mPaintVector,CallbackPointer(lpCallback));
removeHandler(mPaintVector,callbackPointer);
break;
case EraseBackgroundHandler :
removeHandler(mEraseBackgroundVector,CallbackPointer(lpCallback));
removeHandler(mEraseBackgroundVector,callbackPointer);
break;
case PaletteChangedHandler :
removeHandler(mPaletteChangedVector,CallbackPointer(lpCallback));
removeHandler(mPaletteChangedVector,callbackPointer);
break;
case CommandHandler :
removeHandler(mCommandVector,CallbackPointer(lpCallback));
removeHandler(mCommandVector,callbackPointer);
break;
case SetFocusHandler :
removeHandler(mSetFocusVector,CallbackPointer(lpCallback));
removeHandler(mSetFocusVector,callbackPointer);
break;
case KillFocusHandler :
removeHandler(mKillFocusVector,CallbackPointer(lpCallback));
removeHandler(mKillFocusVector,callbackPointer);
break;
case KeyUpHandler :
removeHandler(mKeyUpVector,CallbackPointer(lpCallback));
removeHandler(mKeyUpVector,callbackPointer);
break;
case KeyDownHandler :
removeHandler(mKeyDownVector,CallbackPointer(lpCallback));
removeHandler(mKeyDownVector,callbackPointer);
break;
case SysKeyUpHandler :
removeHandler(mSysKeyUpVector,CallbackPointer(lpCallback));
removeHandler(mSysKeyUpVector,callbackPointer);
break;
case SysKeyDownHandler :
removeHandler(mSysKeyDownVector,CallbackPointer(lpCallback));
removeHandler(mSysKeyDownVector,callbackPointer);
break;
case MinMaxHandler :
removeHandler(mMinMaxVector,CallbackPointer(lpCallback));
removeHandler(mMinMaxVector,callbackPointer);
break;
case EnterIdleHandler :
removeHandler(mEnterIdleVector,CallbackPointer(lpCallback));
removeHandler(mEnterIdleVector,callbackPointer);
break;
case DrawItemHandler :
removeHandler(mDrawItemVector,CallbackPointer(lpCallback));
removeHandler(mDrawItemVector,callbackPointer);
break;
case ControlColorHandler :
removeHandler(mControlColorVector,CallbackPointer(lpCallback));
removeHandler(mControlColorVector,callbackPointer);
break;
case NotifyHandler :
removeHandler(mNotifyVector,CallbackPointer(lpCallback));
removeHandler(mNotifyVector,callbackPointer);
break;
case MenuSelectHandler :
removeHandler(mMenuSelectVector,CallbackPointer(lpCallback));
removeHandler(mMenuSelectVector,callbackPointer);
break;
case MeasureItemHandler :
removeHandler(mMeasureItemVector,CallbackPointer(lpCallback));
removeHandler(mMeasureItemVector,callbackPointer);
break;
case DDEInitiateHandler :
removeHandler(mDDEInitiateVector,CallbackPointer(lpCallback));
removeHandler(mDDEInitiateVector,callbackPointer);
break;
case DDEAckHandler :
removeHandler(mDDEAckVector,CallbackPointer(lpCallback));
removeHandler(mDDEAckVector,callbackPointer);
break;
case DDERequestHandler :
removeHandler(mDDERequestVector,CallbackPointer(lpCallback));
removeHandler(mDDERequestVector,callbackPointer);
break;
case DDETerminateHandler :
removeHandler(mDDETerminateVector,CallbackPointer(lpCallback));
removeHandler(mDDETerminateVector,callbackPointer);
break;
case DDEDataHandler :
removeHandler(mDDEDataVector,CallbackPointer(lpCallback));
removeHandler(mDDEDataVector,callbackPointer);
break;
case MMOpenHandler :
removeHandler(mMMOpenVector,CallbackPointer(lpCallback));
removeHandler(mMMOpenVector,callbackPointer);
break;
case MMCloseHandler :
removeHandler(mMMCloseVector,CallbackPointer(lpCallback));
removeHandler(mMMCloseVector,callbackPointer);
break;
case MMDoneHandler :
removeHandler(mMMDoneVector,CallbackPointer(lpCallback));
removeHandler(mMMDoneVector,callbackPointer);
break;
case CloseHandler :
removeHandler(mCloseVector,CallbackPointer(lpCallback));
removeHandler(mCloseVector,callbackPointer);
break;
case MouseMoveHandler :
removeHandler(mMouseMoveVector,CallbackPointer(lpCallback));
removeHandler(mMouseMoveVector,callbackPointer);
break;
case DialogCodeHandler :
removeHandler(mDialogCodeVector,CallbackPointer(lpCallback));
removeHandler(mDialogCodeVector,callbackPointer);
break;
case DestroyHandler :
removeHandler(mDestroyVector,CallbackPointer(lpCallback));
removeHandler(mDestroyVector,callbackPointer);
break;
case NCDestroyHandler :
removeHandler(mNCDestroyVector,CallbackPointer(lpCallback));
removeHandler(mNCDestroyVector,callbackPointer);
break;
case HorizontalScrollHandler :
removeHandler(mHorizontalScrollVector,CallbackPointer(lpCallback));
removeHandler(mHorizontalScrollVector,callbackPointer);
break;
case VerticalScrollHandler :
removeHandler(mVerticalScrollVector,CallbackPointer(lpCallback));
removeHandler(mVerticalScrollVector,callbackPointer);
break;
case DropFilesHandler :
removeHandler(mDropFilesVector,CallbackPointer(lpCallback));
removeHandler(mDropFilesVector,callbackPointer);
break;
case MDIActivateHandler :
removeHandler(mMDIActivateVector,CallbackPointer(lpCallback));
removeHandler(mMDIActivateVector,callbackPointer);
break;
case MDIDestroyHandler :
removeHandler(mMDIDestroyVector,CallbackPointer(lpCallback));
removeHandler(mMDIDestroyVector,callbackPointer);
break;
case QueryEndSessionHandler :
removeHandler(mQueryEndSessionVector,CallbackPointer(lpCallback));
removeHandler(mQueryEndSessionVector,callbackPointer);
break;
case ActivateAppHandler :
removeHandler(mActivateAppVector,CallbackPointer(lpCallback));
removeHandler(mActivateAppVector,callbackPointer);
break;
case DisplayChangeHandler :
removeHandler(mDisplayChangeVector,CallbackPointer(lpCallback));
removeHandler(mDisplayChangeVector,callbackPointer);
break;
case ShowWindowHandler :
removeHandler(mShowWindowVector,CallbackPointer(lpCallback));
removeHandler(mShowWindowVector,callbackPointer);
break;
case CaptureChangedHandler :
removeHandler(mCaptureChangedVector,CallbackPointer(lpCallback));
removeHandler(mCaptureChangedVector,callbackPointer);
break;
case DeviceChangeHandler :
removeHandler(mDeviceChangeVector,CallbackPointer(lpCallback));
removeHandler(mDeviceChangeVector,callbackPointer);
break;
}
@@ -624,7 +625,7 @@ void VectorHandler::removeHandler(Block<CallbackPointer> &someCallbackVector,Cal
{
size_t size((size_t)someCallbackVector.size());
for(int vectorIndex=0;vectorIndex<size;vectorIndex++)
for(int vectorIndex=0;vectorIndex<(int)size;vectorIndex++)
{
if(someCallbackVector[vectorIndex]==locatePointer)
{
@@ -777,10 +778,13 @@ WORD VectorHandler::insert(Block<CallbackPointer> &someHandlerBlock,PureCallback
if(FirstHandler==callOrder&&someHandlerBlock.size())
{
CallbackPointer firstCallback(someHandlerBlock[0]);
someHandlerBlock[0]=CallbackPointer(lpCallback);
someHandlerBlock.insert(&firstCallback);
CallbackPointer callback(lpCallback);
someHandlerBlock[0]=callback;
// someHandlerBlock[0]=CallbackPointer(lpCallback);
someHandlerBlock.insert(&firstCallback);
}
else someHandlerBlock.insert(&CallbackPointer(lpCallback));
return (WORD)someHandlerBlock.size();
// else someHandlerBlock.insert(&CallbackPointer(lpCallback));
else someHandlerBlock.insert(new CallbackPointer(lpCallback));
return (WORD)someHandlerBlock.size();
}