Fix gtk+ frontend build failures caused by #925

pull/929/head
Hleb Valoshka 2021-03-08 20:26:24 +02:00
parent f89d9068ab
commit de06f3d3cd
7 changed files with 10 additions and 5 deletions

View File

@ -49,6 +49,7 @@
#include "settings-file.h"
#endif /* GNOME */
using namespace std;
/* Declarations: Action Helpers */
static void openScript(const char* filename, AppData* app);
@ -66,9 +67,9 @@ static void setLabelMode(AppData* a, int mode, gboolean state);
void actionCopyURL(GtkAction*, AppData* app)
{
GtkClipboard* cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
CelestiaState appState;
appState.captureState(app->core);
Url url(appState, Url::CurrentVersion);
CelestiaState appState(app->core);
appState.captureState();
Url url(appState);
gtk_clipboard_set_text(cb, url.getAsString().c_str(), -1);
}

View File

@ -21,6 +21,7 @@
#include "common.h"
using namespace std;
/* Returns the offset of the timezone at date */
gint tzOffsetAtDate(astro::Date date)

View File

@ -22,7 +22,7 @@
using namespace Eigen;
using namespace celmath;
using namespace std;
/* Definitions: Callbacks */
static void calDateSelect(GtkCalendar *calendar, GtkToggleButton *button);

View File

@ -25,6 +25,7 @@
#include "actions.h"
#include "common.h"
using namespace std;
/* Declarations: Callbacks */
static void listStarSelect(GtkTreeSelection* sel, AppData* app);

View File

@ -22,6 +22,7 @@
#include "actions.h"
#include "common.h"
using namespace std;
/* Definitions: Callbacks */
static void wrapAction(GtkAction* action);

View File

@ -20,6 +20,7 @@
#include "splash.h"
#include "common.h"
using namespace std;
/* Declarations */
static gboolean splashExpose(GtkWidget* win, GdkEventExpose *event, SplashData* ss);

View File

@ -26,7 +26,7 @@ class GtkSplashProgressNotifier : public ProgressNotifier
GtkSplashProgressNotifier(SplashData* _splash);
virtual ~GtkSplashProgressNotifier();
virtual void update(const string& filename);
virtual void update(const std::string& filename);
private:
SplashData* splash;