supporting clang 2.0 under xcode, see #12332

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/archive.h b/include/wx/archive.h
index 67419a91fc2364dc710bb0fe72abf68f9099c8e5..cd8438972dd2a01ae2b114bbc520f0a18486a6b3 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -225,7 +225,7 @@ public:
         if (it.m_rep)
             it.m_rep.AddRef();
         if (m_rep)
-            m_rep.UnRef();
+            this->m_rep.UnRef();
         m_rep = it.m_rep;
         return *this;
     }

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 4c5c27eede9c6d9447b5d833644a9b5ee52e31c0..254605edf72ebbd70d8a75288281d605fe232b50 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -260,7 +260,7 @@ public:
         {
             if ( len == wxNO_LEN )
                 len = wxStrlen(str);
-            this->m_data = new Data(StrCopy(str, len), len);
+            this->m_data = new Data(this->StrCopy(str, len), len);
         }
         else
         {
@@ -295,7 +295,7 @@ public:
 
     wxCharTypeBuffer(const wxScopedCharTypeBuffer<T>& src)
     {
-        MakeOwnedCopyOf(src);
+        this->MakeOwnedCopyOf(src);
     }
 
     wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer<T>& src)

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 3bf3a3875432778f1ae638a229b6202ef6816695..4f7a3dc8ecee287cee19325167162b762ad4c349 100644 (file)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/control.h"
+DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
@@ -107,13 +108,11 @@ private:
     wxString m_currentURL;
     wxString m_pageTitle;
 
-    struct objc_object *m_webView;
+    WX_WebView m_webView;
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
     void* m_webKitCtrlEventHandler;
-    //It should be WebView*, but WebView is an Objective-C class
-    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 63324a19627011ed764c13302d8a22e31c58ebe6..8da3bb2efcae8b1dc1699dbcdd48ba0b7791f552 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -34,6 +34,8 @@ public:
     wxGenericValidator(bool* val);
         // wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton
     wxGenericValidator(int* val);
+    wxGenericValidator(float* val);
+    wxGenericValidator(double* val);
         // wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only)
     wxGenericValidator(wxString* val);
         // wxListBox, wxCheckListBox
@@ -68,6 +70,8 @@ protected:
 
     bool*       m_pBool;
     int*        m_pInt;
+    float*      m_pFloat;
+    double*     m_pDouble;
     wxString*   m_pString;
     wxArrayInt* m_pArrayInt;
 #if wxUSE_DATETIME

diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 5971e612a67f570d8f978e56a705e575fdbfa0a5..0385c9f9ad669e1f87c3920327bd09cb91a3f642 100644 (file)
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -192,7 +192,7 @@ public:
             else if ( !BaseValidator::FromString(s, &value) )
                 return false;
 
-            if ( !IsInRange(value) )
+            if ( !this->IsInRange(value) )
                 return false;
 
             *m_value = static_cast<ValueType>(value);
@@ -225,7 +225,7 @@ private:
     {
         wxString s;
         if ( value != 0 || !BaseValidator::HasFlag(wxNUM_VAL_ZERO_AS_BLANK) )
-            s = ToString(value);
+            s = this->ToString(value);
 
         return s;
     }
@@ -314,8 +314,8 @@ public:
     wxIntegerValidator(ValueType *value = NULL, int style = wxNUM_VAL_DEFAULT)
         : Base(value, style)
     {
-        DoSetMin(std::numeric_limits<ValueType>::min());
-        DoSetMax(std::numeric_limits<ValueType>::max());
+        this->DoSetMin(std::numeric_limits<ValueType>::min());
+        this->DoSetMax(std::numeric_limits<ValueType>::max());
     }
 
     virtual wxObject *Clone() const { return new wxIntegerValidator(*this); }
@@ -434,8 +434,8 @@ private:
         // NB: Do not use min(), it's not the smallest representable value for
         //     the floating point types but rather the smallest representable
         //     positive value.
-        DoSetMin(-std::numeric_limits<ValueType>::max());
-        DoSetMax( std::numeric_limits<ValueType>::max());
+        this->DoSetMin(-std::numeric_limits<ValueType>::max());
+        this->DoSetMax( std::numeric_limits<ValueType>::max());
     }
 };
 

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 08878903f48ada52804553a10c6c04c425a2b7bd..a59a7e4a0a417299a910d26f96986ec3f677ecbd 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -218,7 +218,7 @@ public:
     // below is not used by at least g++4 when a literal NULL is used
     wxWeakRef(T *pobj)
     {
-        Assign(pobj);
+        this->Assign(pobj);
     }
 #endif // !__VISUALC6__
 
@@ -239,7 +239,7 @@ public:
 
     wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
     {
-        AssignCopy(wr);
+        this->AssignCopy(wr);
         return *this;
     }
 

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index f9e68ef71e26d56f6573d429a1ab623bf825ea05..bdac007cb7e604eac277ca5fd3d537f62942830e 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -467,7 +467,7 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
 // forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH,
 // this fails to compile with VC6, so don't do it for VC. It also causes
 // problems with GCC visibility in newer GCC versions.
-#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5))
+#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5)) || defined(__clang__)
     #define wxNEEDS_DECL_BEFORE_TEMPLATE
 #endif
 

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 1a07e2278d3f605bc73ea37c8fa0b8e551a9e15e..c5d4b5b90005336fc755cfabcd5cc36c16b47e36 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1240,7 +1240,7 @@ public :
     virtual void Transform( const wxGraphicsMatrixData* matrix );
 
     // gets the bounding box enclosing all points (possibly including control points)
-    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const;
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
     virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
 private :

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index b44ef3cd92a2d2a4c86da3e86ad70c6b9c89161a..babc50e4293aa0ce903e9d9a64a40c63e7e87f6d 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -178,6 +178,8 @@ private:
     }
 };
 
+} // anonymous namespace
+
 extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
     
 // set bezel style depending on the wxBORDER_XXX flags specified by the style
@@ -200,7 +202,6 @@ void SetBezelStyleFromBorderFlags(NSButton *v, long style)
     }
 }
 
-} // anonymous namespace
 
 wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 57c8989ccd162443279d720cd302ec24a8d77afc..41d923efad1904822f40f06d2d23e3f1cccf1736 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -987,7 +987,7 @@ bool wxToolBar::Realize()
                     }
 
                     wxCFStringRef cfidentifier;
-                    const NSString *nsItemId;
+                    NSString *nsItemId;
                     if (tool->GetStyle() == wxTOOL_STYLE_SEPARATOR)
                     {
                         nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier
@@ -1249,8 +1249,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
                 {
-                    const NSString * const
-                        nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier
+                    NSString * nsItemId = tool->IsStretchable() ? NSToolbarFlexibleSpaceItemIdentifier
                                                          : NSToolbarSeparatorItemIdentifier;
                     NSToolbarItem* item = [[NSToolbarItem alloc] initWithItemIdentifier:nsItemId];
                     tool->SetToolbarItemRef( item );

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 4a90d9ab3b4e6e05627a65b0dd0cdb3906646c65..6d02169114b1305e002ae52e9c03e41ec203da7d 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -2326,9 +2326,9 @@ void wxPGProperty::AdaptListToValue( wxVariant& list, wxVariant* value ) const
     else
         allChildrenSpecified = true;
 
-    wxVariant childValue = list[0];
     unsigned int i;
     unsigned int n = 0;
+    wxVariant childValue = list[n];
 
     //wxLogDebug(wxT(">> %s.AdaptListToValue()"),GetBaseName().c_str());