From: Dana Jansens Date: Mon, 17 Feb 2003 12:46:55 +0000 (+0000) Subject: rm the SWIG ifdefs X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=c6930ae23498ff5a57279499766f3124b7f7e222;hp=361303715b6eb54d77ed8e1c9ad8f35e44e4ede1;p=chaz%2Fopenbox rm the SWIG ifdefs --- diff --git a/src/openbox.hh b/src/openbox.hh index e718dd25..77b39ce5 100644 --- a/src/openbox.hh +++ b/src/openbox.hh @@ -148,7 +148,6 @@ private: static void signalHandler(int signal); public: -#ifndef SWIG //! Openbox constructor. /*! \param argc Number of command line arguments, as received in main() @@ -157,7 +156,6 @@ public: Openbox(int argc, char **argv); //! Openbox destructor. virtual ~Openbox(); -#endif //! Returns the state of the window manager (starting, exiting, etc) inline RunState state() const { return _state; } @@ -182,7 +180,6 @@ public: //! Returns the mouse cursors used throughout Openbox inline const Cursors &cursors() const { return _cursors; } -#ifndef SWIG //! The main function of the Openbox class /*! This function should be called after instantiating the Openbox class. @@ -190,7 +187,6 @@ public: The Openbox::shutdown method will cause this function to exit. */ void eventLoop(); -#endif //! Adds an Client to the client list for lookups void addClient(Window window, Client *client); diff --git a/src/screen.hh b/src/screen.hh index b84d8b06..d59cf313 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -146,12 +146,10 @@ private: void changeNumDesktops(unsigned int num); public: -#ifndef SWIG //! Constructs a new Screen object Screen(int screen); //! Destroys the Screen object virtual ~Screen(); -#endif inline int number() const { return _number; }