Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

[wxWidgets.git] / include / wx / motif / dcscreen.h

diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h
index e4d4c16979b87554dcfb68aaf3ff55daa3946820..16b498aa71e02dbbb6cfa46f49c7bb6be1a5110a 100644 (file)
--- a/include/wx/motif/dcscreen.h
+++ b/include/wx/motif/dcscreen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcscreen.h"
 #endif
 
 #pragma interface "dcscreen.h"
 #endif
 


@@ -20,29 +20,29 @@
 
 class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
 
 class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
-
- public:
-  // Create a DC representing the whole screen
-  wxScreenDC();
-  ~wxScreenDC();
-
-  // Compatibility with X's requirements for
-  // drawing on top of all windows
-  static bool StartDrawingOnTop(wxWindow* window);
-  static bool StartDrawingOnTop(wxRect* rect = NULL);
-  static bool EndDrawingOnTop();
-
+    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+        
+public:
+    // Create a DC representing the whole screen
+    wxScreenDC();
+    ~wxScreenDC();
+    
+    // Compatibility with X's requirements for
+    // drawing on top of all windows
+    static bool StartDrawingOnTop(wxWindow* window);
+    static bool StartDrawingOnTop(wxRect* rect = NULL);
+    static bool EndDrawingOnTop();
+    

 private:
 private:

-  static WXWindow sm_overlayWindow;
-
-  // If we have started transparent drawing at a non-(0,0) point
-  // then we will have to adjust the device origin in the
-  // constructor.
-  static int sm_overlayWindowX;
-  static int sm_overlayWindowY;
+    static WXWindow sm_overlayWindow;
+    
+    // If we have started transparent drawing at a non-(0,0) point
+    // then we will have to adjust the device origin in the
+    // constructor.
+    static int sm_overlayWindowX;
+    static int sm_overlayWindowY;

 };
 
 #endif
 };
 
 #endif

-    // _WX_DCSCREEN_H_
+// _WX_DCSCREEN_H_