Cleaning FLTK namespace

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12721 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 152 insertions, 148 deletions

diff --git a/src/drivers/Android/Fl_Android_Application.H b/src/drivers/Android/Fl_Android_Application.H
index 004238371..69ba524c0 100644
--- a/src/drivers/Android/Fl_Android_Application.H
+++ b/src/drivers/Android/Fl_Android_Application.H
@@ -39,10 +39,6 @@ extern void (*fl_lock_function)();
 #include <android/looper.h>
 #include <android/native_activity.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Static class that keeps often used data for global access.
  *
@@ -111,6 +107,150 @@ extern "C" {
 class Fl_Android_Application
 {
 public:
+
+  enum {
+    /**
+     * Looper data ID of commands coming from the app's main thread, which
+     * is returned as an identifier from ALooper_pollOnce().  The data for this
+     * identifier is a pointer to an android_poll_source structure.
+     * These can be retrieved and processed with android_app_read_cmd()
+     * and android_app_exec_cmd().
+     */
+            LOOPER_ID_MAIN = 1,
+
+    /**
+     * Looper data ID of events coming from the AInputQueue of the
+     * application's window, which is returned as an identifier from
+     * ALooper_pollOnce().  The data for this identifier is a pointer to an
+     * android_poll_source structure.  These can be read via the inputQueue
+     * object of android_app.
+     */
+            LOOPER_ID_INPUT = 2,
+
+    /**
+     * Start of user-defined ALooper identifiers.
+     */
+            LOOPER_ID_USER = 3,
+  };
+
+  enum {
+    /**
+     * Command from main thread: the AInputQueue has changed.  Upon processing
+     * this command, android_app->inputQueue will be updated to the new queue
+     * (or NULL).
+     */
+            APP_CMD_INPUT_CHANGED,
+
+    /**
+     * Command from main thread: a new ANativeWindow is ready for use.  Upon
+     * receiving this command, android_app->window will contain the new window
+     * surface.
+     */
+            APP_CMD_INIT_WINDOW,
+
+    /**
+     * Command from main thread: the existing ANativeWindow needs to be
+     * terminated.  Upon receiving this command, android_app->window still
+     * contains the existing window; after calling android_app_exec_cmd
+     * it will be set to NULL.
+     */
+            APP_CMD_TERM_WINDOW,
+
+    /**
+     * Command from main thread: the current ANativeWindow has been resized.
+     * Please redraw with its new size.
+     */
+            APP_CMD_WINDOW_RESIZED,
+
+    /**
+     * Command from main thread: the system needs that the current ANativeWindow
+     * be redrawn.  You should redraw the window before handing this to
+     * android_app_exec_cmd() in order to avoid transient drawing glitches.
+     */
+            APP_CMD_WINDOW_REDRAW_NEEDED,
+
+    /**
+     * Command from main thread: the content area of the window has changed,
+     * such as from the soft input window being shown or hidden.  You can
+     * find the new content rect in android_app::contentRect.
+     */
+            APP_CMD_CONTENT_RECT_CHANGED,
+
+    /**
+     * Command from main thread: the app's activity window has gained
+     * input focus.
+     */
+            APP_CMD_GAINED_FOCUS,
+
+    /**
+     * Command from main thread: the app's activity window has lost
+     * input focus.
+     */
+            APP_CMD_LOST_FOCUS,
+
+    /**
+     * Command from main thread: the current device configuration has changed.
+     */
+            APP_CMD_CONFIG_CHANGED,
+
+    /**
+     * Command from main thread: the system is running low on memory.
+     * Try to reduce your memory use.
+     */
+            APP_CMD_LOW_MEMORY,
+
+    /**
+     * Command from main thread: the app's activity has been started.
+     */
+            APP_CMD_START,
+
+    /**
+     * Command from main thread: the app's activity has been resumed.
+     */
+            APP_CMD_RESUME,
+
+    /**
+     * Command from main thread: the app should generate a new saved state
+     * for itself, to restore from later if needed.  If you have saved state,
+     * allocate it with malloc and place it in android_app.savedState with
+     * the size in android_app.savedStateSize.  The will be freed for you
+     * later.
+     */
+            APP_CMD_SAVE_STATE,
+
+    /**
+     * Command from main thread: the app's activity has been paused.
+     */
+            APP_CMD_PAUSE,
+
+    /**
+     * Command from main thread: the app's activity has been stopped.
+     */
+            APP_CMD_STOP,
+
+    /**
+     * Command from main thread: the app's activity is being destroyed,
+     * and waiting for the app thread to clean up and exit before proceeding.
+     */
+            APP_CMD_DESTROY,
+  };
+
+  /**
+   * Data associated with an ALooper fd that will be returned as the "outData"
+   * when that source has data ready.
+   */
+  struct android_poll_source {
+    // The identifier of this source.  May be LOOPER_ID_MAIN or
+    // LOOPER_ID_INPUT.
+    int32_t id;
+
+    // Function to call to perform the standard processing of data from
+    // this source.
+    void (*process)(struct android_poll_source* source);
+  };
+
+
+public:
   static void log_e(const char *text, ...);
   static void log_w(const char *text, ...);
   static void log_i(const char *text, ...);
@@ -210,146 +350,10 @@ private:
   static void onInputQueueDestroyed(ANativeActivity* activity, AInputQueue* queue);
 };
 
-/**
- * Data associated with an ALooper fd that will be returned as the "outData"
- * when that source has data ready.
- */
-struct android_poll_source {
-  // The identifier of this source.  May be LOOPER_ID_MAIN or
-  // LOOPER_ID_INPUT.
-  int32_t id;
-
-  // Function to call to perform the standard processing of data from
-  // this source.
-  void (*process)(struct android_poll_source* source);
-};
-
-enum {
-  /**
-   * Looper data ID of commands coming from the app's main thread, which
-   * is returned as an identifier from ALooper_pollOnce().  The data for this
-   * identifier is a pointer to an android_poll_source structure.
-   * These can be retrieved and processed with android_app_read_cmd()
-   * and android_app_exec_cmd().
-   */
-          LOOPER_ID_MAIN = 1,
-
-  /**
-   * Looper data ID of events coming from the AInputQueue of the
-   * application's window, which is returned as an identifier from
-   * ALooper_pollOnce().  The data for this identifier is a pointer to an
-   * android_poll_source structure.  These can be read via the inputQueue
-   * object of android_app.
-   */
-          LOOPER_ID_INPUT = 2,
-
-  /**
-   * Start of user-defined ALooper identifiers.
-   */
-          LOOPER_ID_USER = 3,
-};
-
-enum {
-  /**
-   * Command from main thread: the AInputQueue has changed.  Upon processing
-   * this command, android_app->inputQueue will be updated to the new queue
-   * (or NULL).
-   */
-          APP_CMD_INPUT_CHANGED,
-
-  /**
-   * Command from main thread: a new ANativeWindow is ready for use.  Upon
-   * receiving this command, android_app->window will contain the new window
-   * surface.
-   */
-          APP_CMD_INIT_WINDOW,
-
-  /**
-   * Command from main thread: the existing ANativeWindow needs to be
-   * terminated.  Upon receiving this command, android_app->window still
-   * contains the existing window; after calling android_app_exec_cmd
-   * it will be set to NULL.
-   */
-          APP_CMD_TERM_WINDOW,
-
-  /**
-   * Command from main thread: the current ANativeWindow has been resized.
-   * Please redraw with its new size.
-   */
-          APP_CMD_WINDOW_RESIZED,
-
-  /**
-   * Command from main thread: the system needs that the current ANativeWindow
-   * be redrawn.  You should redraw the window before handing this to
-   * android_app_exec_cmd() in order to avoid transient drawing glitches.
-   */
-          APP_CMD_WINDOW_REDRAW_NEEDED,
-
-  /**
-   * Command from main thread: the content area of the window has changed,
-   * such as from the soft input window being shown or hidden.  You can
-   * find the new content rect in android_app::contentRect.
-   */
-          APP_CMD_CONTENT_RECT_CHANGED,
-
-  /**
-   * Command from main thread: the app's activity window has gained
-   * input focus.
-   */
-          APP_CMD_GAINED_FOCUS,
-
-  /**
-   * Command from main thread: the app's activity window has lost
-   * input focus.
-   */
-          APP_CMD_LOST_FOCUS,
-
-  /**
-   * Command from main thread: the current device configuration has changed.
-   */
-          APP_CMD_CONFIG_CHANGED,
-
-  /**
-   * Command from main thread: the system is running low on memory.
-   * Try to reduce your memory use.
-   */
-          APP_CMD_LOW_MEMORY,
-
-  /**
-   * Command from main thread: the app's activity has been started.
-   */
-          APP_CMD_START,
-
-  /**
-   * Command from main thread: the app's activity has been resumed.
-   */
-          APP_CMD_RESUME,
-
-  /**
-   * Command from main thread: the app should generate a new saved state
-   * for itself, to restore from later if needed.  If you have saved state,
-   * allocate it with malloc and place it in android_app.savedState with
-   * the size in android_app.savedStateSize.  The will be freed for you
-   * later.
-   */
-          APP_CMD_SAVE_STATE,
-
-  /**
-   * Command from main thread: the app's activity has been paused.
-   */
-          APP_CMD_PAUSE,
 
-  /**
-   * Command from main thread: the app's activity has been stopped.
-   */
-          APP_CMD_STOP,
-
-  /**
-   * Command from main thread: the app's activity is being destroyed,
-   * and waiting for the app thread to clean up and exit before proceeding.
-   */
-          APP_CMD_DESTROY,
-};
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * This is the function that application code must implement, representing
diff --git a/src/drivers/Android/Fl_Android_Application.cxx b/src/drivers/Android/Fl_Android_Application.cxx
index 8794ea2b1..757f366da 100644
--- a/src/drivers/Android/Fl_Android_Application.cxx
+++ b/src/drivers/Android/Fl_Android_Application.cxx
@@ -98,8 +98,8 @@ pthread_cond_t Fl_Android_Application::pCond = { 0 };
 int Fl_Android_Application::pMsgReadPipe = 0;
 int Fl_Android_Application::pMsgWritePipe = 0;
 pthread_t Fl_Android_Application::pThread = 0;
-struct android_poll_source Fl_Android_Application::pCmdPollSource = { 0 };
-struct android_poll_source Fl_Android_Application::pInputPollSource = { 0 };
+struct Fl_Android_Application::android_poll_source Fl_Android_Application::pCmdPollSource = { 0 };
+struct Fl_Android_Application::android_poll_source Fl_Android_Application::pInputPollSource = { 0 };
 int Fl_Android_Application::pRunning = 0;
 int Fl_Android_Application::pStateSaved = 0;
 int Fl_Android_Application::pDestroyed = 0;
diff --git a/src/drivers/Android/Fl_Android_Screen_Driver.cxx b/src/drivers/Android/Fl_Android_Screen_Driver.cxx
index be2c94248..f3e7ddc9c 100644
--- a/src/drivers/Android/Fl_Android_Screen_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Screen_Driver.cxx
@@ -71,7 +71,7 @@ int Fl_Android_Screen_Driver::handle_app_command()
   Fl_Android_Application::pre_exec_cmd(cmd);
 
   // call all registered FLTK system handlers
-  Fl::e_number = ((uint32_t)cmd-APP_CMD_INPUT_CHANGED) + FL_ANDROID_EVENT_INPUT_CHANGED;
+  Fl::e_number = ((uint32_t)(cmd-Fl_Android_Application::APP_CMD_INPUT_CHANGED)) + FL_ANDROID_EVENT_INPUT_CHANGED;
   fl_send_system_handlers(0L);
 
   // fixup and finalize application wide command handling
@@ -156,10 +156,10 @@ int Fl_Android_Screen_Driver::handle_queued_events(double time_to_wait)
     ident = ALooper_pollAll(Fl::damage() ? 0 : -1, NULL, &events, (void **) &source);
     switch (ident) {
       // FIXME:  ALOOPER_POLL_WAKE = -1, ALOOPER_POLL_CALLBACK = -2, ALOOPER_POLL_TIMEOUT = -3, ALOOPER_POLL_ERROR = -4
-      case LOOPER_ID_MAIN:
+      case Fl_Android_Application::LOOPER_ID_MAIN:
         ret = handle_app_command();
         break;
-      case LOOPER_ID_INPUT:
+      case Fl_Android_Application::LOOPER_ID_INPUT:
         ret = handle_input_event();
         break;
       case -3: return ret;