Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Codechange] Fixed some deprecated-declarations #911

Merged
merged 1 commit into from May 14, 2016
Merged

[Codechange] Fixed some deprecated-declarations #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/configurator/Configurator.cpp
View file
Open in desktop
Expand Up @@ -650,7 +650,7 @@ bool MyApp::extractZipFiles(const wxString& aZipFile, const wxString& aTargetDir
{
bool ret = true;
//wxFileSystem fs;
std::auto_ptr<wxZipEntry> entry(new wxZipEntry());
std::unique_ptr<wxZipEntry> entry(new wxZipEntry());
do
{
wxFileInputStream in(aZipFile);
Expand Down Expand Up @@ -710,7 +710,7 @@ bool MyApp::checkUserPath()
if(!wxFileName::DirExists(UserPath))
wxFileName::Mkdir(UserPath);

std::auto_ptr< wxZipEntry > entry;
std::unique_ptr< wxZipEntry > entry;

// first: figure out the zip path
wxFileName skeletonZip = wxFileName(ProgramPath, wxEmptyString);
Expand Down
4 changes: 2 additions & 2 deletions source/main/gui/mygui/GuiPanelBase.h
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ class GuiPanelBase

inline void HideTemporarily()
{
if (m_panel_widget->isVisible())
if (m_panel_widget->getVisible())
{
m_panel_widget->setVisible(false);
m_is_temporarily_hidden = true;
Expand All @@ -68,7 +68,7 @@ class GuiPanelBase
}

inline void Hide() { m_panel_widget->setVisible(false); }
inline bool IsVisible() const { return m_panel_widget->isVisible(); }
inline bool IsVisible() const { return m_panel_widget->getVisible(); }
inline int GetWidthPixels() const { return GetSizePixels().width; }
inline int GetHeightPixels() const { return GetSizePixels().height; }

Expand Down
2 changes: 1 addition & 1 deletion source/main/gui/panels/GUI_MultiplayerSelector.cpp
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ void CLASS::CenterToScreen()

bool CLASS::IsVisible()
{
return MAIN_WIDGET->isVisible();
return MAIN_WIDGET->getVisible();
}

void CLASS::eventMouseButtonClickJoinButton(MyGUI::WidgetPtr _sender)
Expand Down