[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38251] branches/soc-2011-onion/source/ blender/windowmanager/intern: made bContext argument const for WM_event_add_modal_handler, also committing rest of previous commit fixing empty macro argument warning .

[Jason Wilkins]

Revision: 38251
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38251
Author:   jwilkins
Date:     2011-07-09 09:04:32 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
made bContext argument const for WM_event_add_modal_handler, also committing 
rest of previous commit fixing empty macro argument warning.

got files mixed up, this and last commit should be taken together to fix the 
warning and const change.  since these are very minor I'd rather note it here 
than go through the trouble of fixing it properly :)

Modified Paths:
--------------
    
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c

Modified: 
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- 
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c   
    2011-07-09 08:58:33 UTC (rev 38250)
+++ 
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c   
    2011-07-09 09:04:32 UTC (rev 38251)
@@ -2004,7 +2004,7 @@
 }
 #endif
 
-wmEventHandler *WM_event_add_modal_handler(bContext *C, wmOperator *op)
+wmEventHandler *WM_event_add_modal_handler(const bContext *C, wmOperator *op)
 {
        wmEventHandler *handler= MEM_callocN(sizeof(wmEventHandler), "event 
modal handler");
        wmWindow *win= CTX_wm_window(C);

Modified: 
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c  
2011-07-09 08:58:33 UTC (rev 38250)
+++ branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c  
2011-07-09 09:04:32 UTC (rev 38251)
@@ -1252,7 +1252,14 @@
        uiItemStringO(col, "Blender Website", ICON_URL, "WM_OT_url_open", 
"url", "http://www.blender.org/";);
        uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", 
"http://www.blender.org/community/user-community/";); // 
        if(strcmp(STRINGIFY(BLENDER_VERSION_CYCLE), "release")==0) {
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4003) // not enough actual parameters for macro 
STRINGIFY when BLENDER_VERSION_CHAR is empty
+#endif
                BLI_snprintf(url, sizeof(url), 
"http://www.blender.org/documentation/blender_python_api_%d_%d"; 
STRINGIFY(BLENDER_VERSION_CHAR) "_release", BLENDER_VERSION/100, 
BLENDER_VERSION%100);
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
        }
        else {
                BLI_snprintf(url, sizeof(url), 
"http://www.blender.org/documentation/blender_python_api_%d_%d_%d";, 
BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs