1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-30 12:15:50 +01:00

Some cleanup after the notification removal in textfields.

This commit is contained in:
dan
1999-05-16 00:45:34 +00:00
parent da36a4ee96
commit 55d51e546d
2 changed files with 12 additions and 28 deletions

View File

@@ -281,9 +281,9 @@ WMInsertTextFieldText(WMTextField *tPtr, char *text, int position)
}
static void
deleteTextFieldRange(WMTextField *tPtr, WMRange range)
{
void
WMDeleteTextFieldRange(WMTextField *tPtr, WMRange range)
{
CHECK_CLASS(tPtr, WC_TextField);
if (range.position >= tPtr->textLen)
@@ -314,13 +314,6 @@ deleteTextFieldRange(WMTextField *tPtr, WMRange range)
}
void
WMDeleteTextFieldRange(WMTextField *tPtr, WMRange range)
{
deleteTextFieldRange(tPtr, range);
}
char*
WMGetTextFieldText(WMTextField *tPtr)
@@ -1022,7 +1015,8 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
range.count = 1;
}
WMDeleteTextFieldRange(tPtr, range);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification, NULL);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification,
(void*)WMDeleteTextEvent);
}
break;
@@ -1046,7 +1040,8 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
range.count = 1;
}
WMDeleteTextFieldRange(tPtr, range);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification, NULL);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification,
(void*)WMDeleteTextEvent);
}
break;
@@ -1066,9 +1061,10 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
range.count = 1;
}
if (tPtr->prevselection.count)
deleteTextFieldRange(tPtr, range);
WMDeleteTextFieldRange(tPtr, range);
WMInsertTextFieldText(tPtr, buffer, tPtr->cursorPosition);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification, NULL);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification,
(void*)WMInsertTextEvent);
} else {
return;
}
@@ -1250,7 +1246,8 @@ handleTextFieldActionEvents(XEvent *event, void *data)
if (text) {
WMInsertTextFieldText(tPtr, text, tPtr->cursorPosition);
XFree(text);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification, NULL);
NOTIFY(tPtr, didChange, WMTextDidChangeNotification,
(void*)WMInsertTextEvent);
}
}
break;