Changeset 247

Timestamp:

Mar 10, 2007, 6:58:41 PM (18 years ago)

Author:

cinc

Message:

Renamed wpSetWPObject()/wpQueryWPObject() of class WPWindow to wpSetObject()/wpQueryObject() for consistency.

Location:

trunk/desktop

Files:

• class_c/wpfolder.c (modified) (1 diff)
• class_c/wpfolderwindow.c (modified) (6 diffs)
• class_c/wpwindow.c (modified) (2 diffs)
• dox/examples/wpsetwpobject.c (modified) (2 diffs)
• idl/wpwindow.idl (modified) (4 diffs)

trunk/desktop/class_c/wpfolder.c

@@ -635 +635 @@
 
   /* Save a pointer to the desktop folder object */
-  WPFolderWindow_wpSetWPObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
+  WPFolderWindow_wpSetObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
 
   /* Connect to the "item_activated" signal */

trunk/desktop/class_c/wpfolderwindow.c

@@ -127 +127 @@
             /* Click on white space */
             WPFolder* wpFolder;
-            wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);
+            wpFolder=(WPFolder*)WPFolderWindow_wpQueryObject(pWindow, NULLHANDLE);
             TST_OBJECT(wpFolder);
             
@@ -216 +216 @@
         return FALSE;
 
-      wpObject=WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
+      wpObject=WPFolderWindow_wpQueryObject(pWindow, NULLHANDLE);     
 
       if(!nomIsObj(wpObject))
@@ -341 +341 @@
         /* Add the object to the list of items for this drag */
         NOMDragInfo_addWPObjectToItemList(nomDragInfo, wpObject,
-                                       (PWPFolder)WPFolderWindow_wpQueryWPObject(wpFolderWindow, NULLHANDLE),
+                                       (PWPFolder)WPFolderWindow_wpQueryObject(wpFolderWindow, NULLHANDLE),
                                        widget, NULLHANDLE);
       }
@@ -409 +409 @@
         return FALSE;
 
-      wpObject=WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
+      wpObject=WPFolderWindow_wpQueryObject(pWindow, NULLHANDLE);     
 
       if(!nomIsObj(wpObject))
@@ -652 +652 @@
 
 #if 0
-  /* Handle mouse buttons */
-  g_signal_connect (GTK_WIDGET(icon_view), "button-press-event",
-                    G_CALLBACK (fldr_handleButtonEvent), nomSelf);
-  g_signal_connect (GTK_WIDGET(icon_view), "button-release-event",
-                    G_CALLBACK (fldr_handleButtonEvent), nomSelf);
-
-  /* Handle folder DnD */
-  g_signal_connect(GTK_WIDGET(icon_view), "drag-begin",
-                   G_CALLBACK(fldrWindowHandleDragBegin), nomSelf);
-  g_signal_connect(GTK_WIDGET(icon_view), "drag-motion",
-                   G_CALLBACK(fldrWindowHandleDragMotion), nomSelf);
-  g_signal_connect(GTK_WIDGET(icon_view), "drag-drop",
-                   G_CALLBACK(fldrWindowHandleDragDrop), nomSelf);
-  g_signal_connect(GTK_WIDGET(icon_view), "drag_data_received",
-                   G_CALLBACK(fldrWindowHandleDragDataReceived), nomSelf);
-  g_signal_connect(GTK_WIDGET(icon_view), "drag_data_get",
-                   G_CALLBACK(fldrWindowHandleDragDataGet), nomSelf);
-
-  /* Prepare drag and drop */
-  gtk_drag_source_set(GTK_WIDGET(icon_view), GDK_BUTTON3_MASK, targetEntries,
-                      G_N_ELEMENTS(targetEntries),
-                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
-  gtk_drag_dest_set(GTK_WIDGET(icon_view), GTK_DEST_DEFAULT_ALL, targetEntries, 1,
-                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
-#endif
-#if 0
   /* Connect to the "clicked" signal of the "Up" tool button */
   g_signal_connect (up_button, "clicked",
@@ -683 +657 @@
 #endif
 
+  /* Prepare drag and drop */
   _wpConnectDefaultSignalHandlers(nomSelf, icon_view, NULLHANDLE);
   WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);

trunk/desktop/class_c/wpwindow.c

@@ -57 +57 @@
    info.
 
-   \sa wpQueryWPObject(), wpSetWPObject()
+   \sa wpQueryObject(), wpSetObject()
  */
-NOM_Scope void NOMLINK impl_WPWindow_wpSetWPObject(WPWindow* nomSelf, const PWPObject wpObject, CORBA_Environment *ev)
+NOM_Scope void NOMLINK impl_WPWindow_wpSetObject(WPWindow* nomSelf, const PWPObject wpObject, CORBA_Environment *ev)
 {
   WPWindowData* nomThis=WPWindowGetData(nomSelf);
@@ -71 +71 @@
    \sa wpQueryWPObject(), wpSetWPObject()
  */
-NOM_Scope PWPObject NOMLINK impl_WPWindow_wpQueryWPObject(WPWindow* nomSelf, CORBA_Environment *ev)
+NOM_Scope PWPObject NOMLINK impl_WPWindow_wpQueryObject(WPWindow* nomSelf, CORBA_Environment *ev)
 {
   WPWindowData* nomThis=WPWindowGetData(nomSelf);

trunk/desktop/dox/examples/wpsetwpobject.c

@@ -1 +1 @@
 /**
-  This method creates the folder window it doesn't query any files or creates
+  This method creates a folder window it doesn't query any files or creates
   models and stuff.
 */
@@ -15 +15 @@
 
   /* Save a pointer to the desktop folder object */
-  WPFolderWindow_wpSetWPObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
+  WPFolderWindow_wpSetObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
 
   /* Connect to the "item_activated" signal */

trunk/desktop/idl/wpwindow.idl

@@ -79 +79 @@
      g_object_set_data(G_OBJECT(window), NOMOBJECT_KEY_STRING, nomSelf);
      \endcode
-     That call is used internally by the WPWindow class to connect a WPWindow instance
+     That function is used internally by the WPWindow class to connect a WPWindow instance
      (nomSelf in this call) with a GTK window.
 
@@ -89 +89 @@
      \par Example:
      The follwing code is a method implementation of class WPFolder. It creates a new
-     folder window (of class WPFolderWindow) and uses wpSetWPObject() to connect the folder
+     folder window (of class WPFolderWindow) and uses wpSetObject() to connect the folder
      object (nomSelf) with the folder window.
      \include wpsetwpobject.c
 
-     \sa wpQueryWPObject()
+     \sa wpQueryObject()
    */
-  void wpSetWPObject(in PWPObject wpObject);
+  void wpSetObject(in PWPObject wpObject);
 
   /**
@@ -104 +104 @@
      g_object_get_data(G_OBJECT(window), NOMOBJECT_KEY_STRING);
      \endcode
-     Using that call one queries the window object (\b not the desktop object) from
+     Using that function one queries the window object (\b not the desktop object) from
      a GTK toplevel window.
 
@@ -110 +110 @@
      This method is usually not overriden.
 
-     \sa wpSetWPObject()
+     \sa wpSetObject()
   */
-  PWPObject wpQueryWPObject();
+  PWPObject wpQueryObject();
   void wpSetWindowTitle(in PNOMString newTitle);
   NOMINSTANCEVAR(PWPObject wpObject);