From 55d51e546d890ff1f97b4c70ddc86d6e2b1be85b Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sun, 16 May 1999 00:45:34 +0000
Subject: [PATCH] Some cleanup after the notification removal in textfields.

---
 WINGs/wfilepanel.c | 13 -------------
 WINGs/wtextfield.c | 27 ++++++++++++---------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 7c45e9ff..f4ca89e6 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -45,9 +45,6 @@ typedef struct W_FilePanel {
 	unsigned int canFreeFileTypes:1;
 	unsigned int fileMustExist:1;
 	unsigned int panelType:1;
-
-	/**/
-	unsigned int ignoreTextChangeNotification:1;
     } flags;
 } W_FilePanel;
 
@@ -117,9 +114,6 @@ textChangedObserver(void *observerData, WMNotification *notification)
     int col = WMGetBrowserNumberOfColumns(panel->browser) - 1;
     int i, textEvent;
 
-    if (panel->flags.ignoreTextChangeNotification)
-	return;
-
     if (!(list = WMGetBrowserListInColumn(panel->browser, col)))
 	return;
 
@@ -142,11 +136,8 @@ textChangedObserver(void *observerData, WMNotification *notification)
         if (textEvent!=WMDeleteTextEvent) {
             WMRange range;
 
-            panel->flags.ignoreTextChangeNotification = 1;
 	    WMInsertTextFieldText(panel->fileField, &item->text[textLen],
                                   textLen);
-            panel->flags.ignoreTextChangeNotification = 0;
-
 	    WMSetTextFieldCursorPosition(panel->fileField, itemTextLen);
 	    range.position = textLen;
 	    range.count = itemTextLen - textLen;
@@ -571,15 +562,11 @@ browserClick(WMBrowser *bPtr, WMFilePanel *panel)
     int col = WMGetBrowserSelectedColumn(bPtr);
     WMListItem *item = WMGetBrowserSelectedItemInColumn(bPtr, col);
 
-    panel->flags.ignoreTextChangeNotification = 1;
-
     if (!item || item->isBranch)
 	WMSetTextFieldText(panel->fileField, NULL);
     else {
 	WMSetTextFieldText(panel->fileField, item->text);
     }
-
-    panel->flags.ignoreTextChangeNotification = 0;
 }
 
 
diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c
index 4d461227..cea83965 100644
--- a/WINGs/wtextfield.c
+++ b/WINGs/wtextfield.c
@@ -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;