1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

v2.10.3.1

This commit is contained in:
gnosygnu
2015-10-18 22:17:57 -04:00
parent 8e18af05b6
commit 4f43f51b18
1935 changed files with 12500 additions and 12889 deletions

View File

@@ -20,7 +20,7 @@ import java.awt.KeyboardFocusManager;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
class GxwCbkHost_ {
public class GxwCbkHost_ {
public static final GxwCbkHost Null = new GfuiHost_cls_null();
public static final boolean ExecKeyEvent(GxwCbkHost host, KeyEvent e) {
boolean rv = true; int id = e.getID(), val = e.getKeyCode();

View File

@@ -55,14 +55,14 @@ public class GxwCore_lang extends GxwCore_base {
@Override public ColorAdp BackColor() {return XtoColorAdp(control.getBackground());}
@Override public void BackColor_set(ColorAdp v) {
if (control instanceof JComponent) {
((JComponent)control).setBackground(ColorAdpCache._.GetNativeColor(v));
((JComponent)control).setBackground(ColorAdpCache.Instance.GetNativeColor(v));
}
else if (control instanceof RootPaneContainer) {
RootPaneContainer container = (RootPaneContainer)control;
container.getContentPane().setBackground(ColorAdpCache._.GetNativeColor(v));
container.getContentPane().setBackground(ColorAdpCache.Instance.GetNativeColor(v));
}
}
@Override public ColorAdp ForeColor() {return XtoColorAdp(control.getForeground());} @Override public void ForeColor_set(ColorAdp v) {control.setForeground(ColorAdpCache._.GetNativeColor(v));}
@Override public ColorAdp ForeColor() {return XtoColorAdp(control.getForeground());} @Override public void ForeColor_set(ColorAdp v) {control.setForeground(ColorAdpCache.Instance.GetNativeColor(v));}
@Override public FontAdp TextFont() {
if (prvFont != null) return prvFont;
Font f = control.getFont();

View File

@@ -31,9 +31,9 @@ public abstract class GxwElemFactory_base {
// @gplx.Internal protected GxwElem spacer_() {return MockControl.new_();}
}
class GxwElemFactory_ {
public static GxwElemFactory_base _ = new GxwElemFactory_cls_mock();
public static void winForms_() {_ = new GxwElemFactory_cls_lang();}
public static void swt_(org.eclipse.swt.widgets.Display display) {_ = new GxwElemFactory_swt(display);}
public static GxwElemFactory_base Instance = new GxwElemFactory_cls_mock();
public static void winForms_() {Instance = new GxwElemFactory_cls_lang();}
public static void swt_(org.eclipse.swt.widgets.Display display) {Instance = new GxwElemFactory_swt(display);}
}
class GxwElemFactory_cls_lang extends GxwElemFactory_base {
@gplx.Internal @Override protected GxwElem control_() {return new GxwElem_lang();}
@@ -61,9 +61,9 @@ class GxwElemFactory_cls_lang extends GxwElemFactory_base {
}
class GxwElemFactory_cls_mock extends GxwElemFactory_base {
@gplx.Internal @Override protected GxwElem control_() {return GxwElem_mock_base.new_();}
@gplx.Internal @Override protected GxwWin win_app_() {return MockForm._;}
@gplx.Internal @Override protected GxwWin win_tool_(KeyValHash ctorArgs) {return MockForm._;}
@gplx.Internal @Override protected GxwWin win_toaster_(KeyValHash ctorArgs) {return MockForm._;}
@gplx.Internal @Override protected GxwWin win_app_() {return MockForm.Instance;}
@gplx.Internal @Override protected GxwWin win_tool_(KeyValHash ctorArgs) {return MockForm.Instance;}
@gplx.Internal @Override protected GxwWin win_toaster_(KeyValHash ctorArgs) {return MockForm.Instance;}
@gplx.Internal @Override protected GxwElem lbl_() {return GxwElem_mock_base.new_();}
@gplx.Internal @Override protected GxwTextFld text_fld_() {return new MockTextBox();}
@gplx.Internal @Override protected GxwTextFld text_memo_() {return new MockTextBoxMulti();}

View File

@@ -159,8 +159,8 @@ class GxwTextHtml_editor extends JEditorPane implements GxwTextHtml {
}
public String Html_print() {
String_bldr sb = String_bldr_.new_();
sb.Add("selBgn=").Add(Int_.Xto_str(Html_sel_bgn())).Add_char_crlf();
sb.Add("selEnd=").Add(Int_.Xto_str(Html_sel_end())).Add_char_crlf();
sb.Add("selBgn=").Add(Int_.To_str(Html_sel_bgn())).Add_char_crlf();
sb.Add("selEnd=").Add(Int_.To_str(Html_sel_end())).Add_char_crlf();
sb.Add("selTxt=").Add(Html_sel_text()).Add_char_crlf();
KeyVal[] atrs = Html_sel_atrs();
for (int i = 0; i < atrs.length; i++) {

View File

@@ -27,5 +27,5 @@ public class MockForm extends GxwElem_mock_base implements GxwWin {
public void OpenedCmd_set(GfoInvkAbleCmd v) {}
public void TaskbarVisible_set(boolean val) {}
public void TaskbarParkingWindowFix(GxwElem form) {}
public static final MockForm _ = new MockForm(); MockForm() {}
public static final MockForm Instance = new MockForm(); MockForm() {}
}