projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use use UTF-8 to PUA mapping hack, it's not necessary any more now that wxConvA...
[wxWidgets.git]
/
src
/
common
/
mediactrlcmn.cpp
diff --git
a/src/common/mediactrlcmn.cpp
b/src/common/mediactrlcmn.cpp
index 2563d85a8f3e69ba1ebdb0ff91827c255befa22a..6120cada491a7cebc59b3a9affa3c072d0d0838e 100644
(file)
--- a/
src/common/mediactrlcmn.cpp
+++ b/
src/common/mediactrlcmn.cpp
@@
-12,11
+12,11
@@
// TODO: Platform specific backend defaults?
//===========================================================================
// TODO: Platform specific backend defaults?
//===========================================================================
-// De
fini
tions
+// De
clara
tions
//===========================================================================
//---------------------------------------------------------------------------
//===========================================================================
//---------------------------------------------------------------------------
-//
Pre-compiled header stuff
+//
Includes
//---------------------------------------------------------------------------
#include "wx/wxprec.h"
//---------------------------------------------------------------------------
#include "wx/wxprec.h"
@@
-29,11
+29,9
@@
#ifndef WX_PRECOMP
#include "wx/hash.h"
#ifndef WX_PRECOMP
#include "wx/hash.h"
+ #include "wx/log.h"
#endif
#endif
-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
#include "wx/mediactrl.h"
//===========================================================================
#include "wx/mediactrl.h"
//===========================================================================
@@
-115,17
+113,18
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
}
}
}
}
- Set
BestFitting
Size(size);
+ Set
Initial
Size(size);
return true;
}
else
{
return true;
}
else
{
- wxClassInfo::
sm_classTable->BeginFind
();
+ wxClassInfo::
const_iterator it = wxClassInfo::begin_classinfo
();
- wxClassInfo* classInfo;
+
const
wxClassInfo* classInfo;
- while((classInfo = NextBackend()) != NULL)
+ while((classInfo = NextBackend(
&it
)) != NULL)
{
{
+ wxLogMessage( classInfo->GetClassName() );
if(!DoCreate(classInfo, parent, id,
pos, size, style, validator, name))
continue;
if(!DoCreate(classInfo, parent, id,
pos, size, style, validator, name))
continue;
@@
-134,7
+133,7
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
{
if (Load(fileName))
{
{
if (Load(fileName))
{
- Set
BestFitting
Size(size);
+ Set
Initial
Size(size);
return true;
}
else
return true;
}
else
@@
-142,7
+141,7
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
}
else
{
}
else
{
- Set
BestFitting
Size(size);
+ Set
Initial
Size(size);
return true;
}
}
return true;
}
}
@@
-178,16
+177,16
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
return false;
}
return false;
}
- Set
BestFitting
Size(size);
+ Set
Initial
Size(size);
return true;
}
else
{
return true;
}
else
{
- wxClassInfo::
sm_classTable->BeginFind
();
+ wxClassInfo::
const_iterator it = wxClassInfo::begin_classinfo
();
- wxClassInfo* classInfo;
+
const
wxClassInfo* classInfo;
- while((classInfo = NextBackend()) != NULL)
+ while((classInfo = NextBackend(
&it
)) != NULL)
{
if(!DoCreate(classInfo, parent, id,
pos, size, style, validator, name))
{
if(!DoCreate(classInfo, parent, id,
pos, size, style, validator, name))
@@
-195,7
+194,7
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
if (Load(location))
{
if (Load(location))
{
- Set
BestFitting
Size(size);
+ Set
Initial
Size(size);
return true;
}
else
return true;
}
else
@@
-212,7
+211,7
@@
bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
//
// Attempts to create the control from a backend
//---------------------------------------------------------------------------
//
// Attempts to create the control from a backend
//---------------------------------------------------------------------------
-bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo,
+bool wxMediaCtrl::DoCreate(
const
wxClassInfo* classInfo,
wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@
-246,19
+245,18
@@
bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo,
// incompatible with the old 2.4 stable version - but since
// we're in 2.5+ only we don't need to worry about the new version
//---------------------------------------------------------------------------
// incompatible with the old 2.4 stable version - but since
// we're in 2.5+ only we don't need to worry about the new version
//---------------------------------------------------------------------------
-
wxClassInfo* wxMediaCtrl::NextBackend(
)
+
const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it
)
{
{
- wxHashTable::compatibility_iterator
- node = wxClassInfo::sm_classTable->Next();
- while (node)
+ for ( wxClassInfo::const_iterator end = wxClassInfo::end_classinfo();
+ *it != end; ++(*it) )
{
{
-
wxClassInfo* classInfo = (wxClassInfo *)node->GetData()
;
+
const wxClassInfo* classInfo = **it
;
if ( classInfo->IsKindOf(CLASSINFO(wxMediaBackend)) &&
classInfo != CLASSINFO(wxMediaBackend) )
{
if ( classInfo->IsKindOf(CLASSINFO(wxMediaBackend)) &&
classInfo != CLASSINFO(wxMediaBackend) )
{
+ ++(*it);
return classInfo;
}
return classInfo;
}
- node = wxClassInfo::sm_classTable->Next();
}
//
}
//