-#define SET_CALLBACK(a) \
- if( fgStructure.Window == NULL ) \
- return; \
- FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+#define SET_CALLBACK(a) \
+do \
+{ \
+ if( fgStructure.CurrentWindow == NULL ) \
+ return; \
+ SET_WCB( ( *( fgStructure.CurrentWindow ) ), a, callback ); \
+} while( 0 )