warning fix

[wxWidgets.git] / wxPython / src / _font.i

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 2805c2279e15c76043c4606aa63ca93f91796e85..7ee9fd9540423d0742b7c5017bf268fbae58db46 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -240,7 +240,9 @@ public:
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;

+#ifdef __WXMSW__

     wxSize GetPixelSize() const;
     wxSize GetPixelSize() const;

+#endif

     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;


@@ -249,7 +251,9 @@ public:
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);

+#ifdef __WXMSW__

     void SetPixelSize(const wxSize& pixelSize);
     void SetPixelSize(const wxSize& pixelSize);

+#endif

     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);


@@ -445,19 +449,21 @@ public:
             wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
     ~wxFont();
 
             wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
     ~wxFont();
 

-    %name(FontFromNativeInfo) wxFont(const wxNativeFontInfo& info);
+    %RenameCtor(FontFromNativeInfo,  wxFont(const wxNativeFontInfo& info));

     %extend {
     %extend {

-        %name(FontFromNativeInfoString) wxFont(const wxString& info) {
+        %RenameCtor(FontFromNativeInfoString, wxFont(const wxString& info))
+        {

             wxNativeFontInfo nfi;
             nfi.FromString(info);
             return new wxFont(nfi);
         }
 
             wxNativeFontInfo nfi;
             nfi.FromString(info);
             return new wxFont(nfi);
         }
 

-        %name(Font2) wxFont(int pointSize,
-                            wxFontFamily family,
-                            int flags = wxFONTFLAG_DEFAULT,
-                            const wxString& face = wxPyEmptyString,
-                            wxFontEncoding encoding = wxFONTENCODING_DEFAULT) {
+        %RenameCtor(Font2,  wxFont(int pointSize,
+                                   wxFontFamily family,
+                                   int flags = wxFONTFLAG_DEFAULT,
+                                   const wxString& face = wxPyEmptyString,
+                                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT))
+        {

             return wxFont::New(pointSize, family, flags, face, encoding);
         }
     }
             return wxFont::New(pointSize, family, flags, face, encoding);
         }
     }


@@ -465,13 +471,14 @@ public:
     // There is a real ctor for this on wxMSW, but not the others, so just use
     // the factory funciton in all cases.
     %extend {
     // There is a real ctor for this on wxMSW, but not the others, so just use
     // the factory funciton in all cases.
     %extend {

-        %name(FontFromPixelSize) wxFont(const wxSize& pixelSize,
-                                        int family,
-                                        int style,
-                                        int weight,
-                                        bool underlined = false,
-                                        const wxString& face = wxEmptyString,
-                                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT) {
+        %RenameCtor(FontFromPixelSize, wxFont(const wxSize& pixelSize,
+                                              int family,
+                                              int style,
+                                              int weight,
+                                              bool underlined = false,
+                                              const wxString& face = wxEmptyString,
+                                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT))
+        {

             return wxFontBase::New(pixelSize, family,
                                    style, weight, underlined,
                                    face, encoding);
             return wxFontBase::New(pixelSize, family,
                                    style, weight, underlined,
                                    face, encoding);


@@ -517,7 +524,7 @@ public:
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
     void SetNativeFontInfo(const wxNativeFontInfo& info);
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
     void SetNativeFontInfo(const wxNativeFontInfo& info);

-    %name(SetNativeFontInfoFromString) void SetNativeFontInfo(const wxString& info);
+    %Rename(SetNativeFontInfoFromString, void, SetNativeFontInfo(const wxString& info));

     void SetNativeFontInfoUserDesc(const wxString& info);
 
     // translate the fonts into human-readable string (i.e. GetStyleString()
     void SetNativeFontInfoUserDesc(const wxString& info);
 
     // translate the fonts into human-readable string (i.e. GetStyleString()


@@ -561,7 +568,8 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 MustHaveApp(wxPyFontEnumerator);
 
 
 MustHaveApp(wxPyFontEnumerator);
 

-%name(FontEnumerator) class wxPyFontEnumerator {
+%rename(FontEnumerator) wxPyFontEnumerator;
+class wxPyFontEnumerator {

 public:
     %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
 
 public:
     %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"