iconv-based conversion works again, after being broken for a while

[wxWidgets.git] / contrib / include / wx / applet / ifelsevar.h

diff --git a/contrib/include/wx/applet/ifelsevar.h b/contrib/include/wx/applet/ifelsevar.h
index 851cc82a53ed1ea76f82afa6c6304e0a3965d0ef..5a95b84ff77e728153252426f1c7c7d4735303dc 100644 (file)
--- a/contrib/include/wx/applet/ifelsevar.h
+++ b/contrib/include/wx/applet/ifelsevar.h
@@ -66,8 +66,8 @@ public:
 
 public:
     // static function to retrieve any variable avaliable
 
 public:
     // static function to retrieve any variable avaliable

-    static bool GetValue(const wxString &cls);
-};
+    static bool FindValue(const wxString &cls);
+    };

 
 /*--------------------------------- MACROS --------------------------------*/
 
 
 /*--------------------------------- MACROS --------------------------------*/
 


@@ -82,14 +82,13 @@ public:
     IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable);    \
     bool wxIfElseVariable##name :: GetValue() const {
 
     IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable);    \
     bool wxIfElseVariable##name :: GetValue() const {
 

-#define END_IFELSE_VARIABLE(name, returnval)                                \
+#define END_IFELSE_VARIABLE(returnval)                                      \

     return returnval;                                                       \
     }
 
 #define IFELSE_VARIABLE(name, state)                                        \
     BEGIN_IFELSE_VARIABLE(##name##);                                        \
     return returnval;                                                       \
     }
 
 #define IFELSE_VARIABLE(name, state)                                        \
     BEGIN_IFELSE_VARIABLE(##name##);                                        \

-    END_IFELSE_VARIABLE(##name##, bool (state))
-
+    END_IFELSE_VARIABLE(bool (state))

 
 #endif // __WX_IFELSEVAR_H
 
 
 #endif // __WX_IFELSEVAR_H