9.06 beta

1 files changed, 12 insertions, 11 deletions

diff --git a/CPP/Windows/Control/Static.h b/CPP/Windows/Control/Static.h
index 5dded0ec..cb3126dd 100755
--- a/CPP/Windows/Control/Static.h
+++ b/CPP/Windows/Control/Static.h
@@ -3,8 +3,7 @@
 #ifndef __WINDOWS_CONTROL_STATIC_H
 #define __WINDOWS_CONTROL_STATIC_H
 
-#include "Windows/Window.h"
-#include "Windows/Defs.h"
+#include "../Window.h"
 
 namespace NWindows {
 namespace NControl {
@@ -12,16 +11,18 @@ namespace NControl {
 class CStatic: public CWindow
 {
 public:
-  HICON SetIcon(HICON icon)
-    { return (HICON)SendMessage(STM_SETICON, (WPARAM)icon, 0); }
-  HICON GetIcon()
-    { return (HICON)SendMessage(STM_GETICON, 0, 0); }
-  HANDLE SetImage(WPARAM imageType, HANDLE handle)
-    { return (HANDLE)SendMessage(STM_SETIMAGE, imageType, (LPARAM)handle); }
-  HANDLE GetImage(WPARAM imageType)
-    { return (HANDLE)SendMessage(STM_GETIMAGE, imageType, 0); }
+  HANDLE SetImage(WPARAM imageType, HANDLE handle) { return (HANDLE)SendMessage(STM_SETIMAGE, imageType, (LPARAM)handle); }
+  HANDLE GetImage(WPARAM imageType) { return (HANDLE)SendMessage(STM_GETIMAGE, imageType, 0); }
+
+  #ifdef UNDER_CE
+  HICON SetIcon(HICON icon) { return (HICON)SetImage(IMAGE_ICON, icon); }
+  HICON GetIcon() { return (HICON)GetImage(IMAGE_ICON); }
+  #else
+  HICON SetIcon(HICON icon) { return (HICON)SendMessage(STM_SETICON, (WPARAM)icon, 0); }
+  HICON GetIcon() { return (HICON)SendMessage(STM_GETICON, 0, 0); }
+  #endif
 };
 
 }}
 
-#endif
\ No newline at end of file
+#endif